Merge remote-tracking branch 'codemirror/master'

# Conflicts:
#	package.json

Author: jackycute

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /npm-debug.log
+/package-lock.json
 /test*.html
 .tern-*
 *~

.npmignore

@@ -8,4 +8,7 @@
 /mode/*/*.html
 /mode/index.html
 .*
-bin
+/bin/authors.sh
+/bin/lint
+/bin/release
+/bin/upload-release.js

.travis.yml

@@ -2,3 +2,4 @@ language: node_js
 node_js:
   - stable
 sudo: false
+cache: npm

AUTHORS

@@ -4,7 +4,9 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abdelouahab
+Abdussalam Abdurrahman
 Abe Fettig
+Abhishek Gahlot
 Adam Ahmed
 Adam King
 Adam Particka
@@ -84,7 +86,9 @@ AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Axel Lewenhaupt
+Baptiste Augrain
 Barret Rennie
+Bartosz Dziewoński
 Basarat Ali Syed
 Bastian Müller
 belhaj
@@ -154,6 +158,7 @@ coderaiser
 Cole R Lawrence
 ComFreek
 Cristian Prieto
+Curran Kelleher
 Curtis Gagliardi
 dagsta
 daines
@@ -163,6 +168,7 @@ Dan Heberden
 Daniel, Dao Quang Minh
 Daniele Di Sarli
 Daniel Faust
+Daniel Hanggi
 Daniel Huigens
 Daniel Kesler
 Daniel KJ
@@ -173,12 +179,15 @@ Danila Malyutin
 Danny Yoo
 darealshinji
 Darius Roberts
+databricks-david-lewis
 Dave Brondsema
+Dave MacLachlan
 Dave Myers
 David Barnett
 David H. Bronke
 David Mignot
 David Pathakjee
+David Santana
 David Vázquez
 David Whittington
 deebugger
@@ -188,10 +197,12 @@ Devon Carew
 Dick Choi
 dignifiedquire
 Dimage Sapelkin
+dmaclach
 Dmitry Kiselyov
 domagoj412
 Dominator008
 Domizio Demichelis
+Doug Blank
 Doug Wikle
 Drew Bratcher
 Drew Hintz
@@ -223,6 +234,7 @@ ficristo
 Filip Noetzel
 Filip Stollár
 Filype Pereira
+finalfantasia
 flack
 Florian Felten
 ForbesLindesay
@@ -251,7 +263,7 @@ Glenn Jorde
 Glenn Ruehle
 goldsmcb
 Golevka
-Google Inc.
+Google LLC
 Gordon Smith
 Grant Skinner
 greengiant
@@ -264,6 +276,7 @@ guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
+Harald Schilly
 Hardest
 Harshvardhan Gupta
 Hasan Karahan
@@ -383,6 +396,7 @@ Kevin Kwok
 Kevin Muret
 Kevin Sawicki
 Kevin Ushey
+Kier Darby
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
@@ -410,6 +424,7 @@ Lior Shub
 LloydMilligan
 LM
 lochel
+Lorenzo Simionato
 Lorenzo Stoakes
 Louis Mauchet
 Luca Fabbri
@@ -457,6 +472,7 @@ Matthew Bauer
 Matthew Beale
 matthewhayes
 Matthew Rathbone
+Matthew Suozzo
 Matthias Bussonnier
 Matthias BUSSONNIER
 Matt MacPherson
@@ -489,7 +505,9 @@ Michal Kapiczynski
 Mighty Guava
 Miguel Castillo
 mihailik
+Mika Andrianarijaona
 Mike
+Mike Bostock
 Mike Brevoort
 Mike Diaz
 Mike Ivanov
@@ -532,6 +550,7 @@ Niels van Groningen
 nightwing
 Nikita Beloglazov
 Nikita Vasilyev
+Nikolaj Kappler
 Nikolay Kostov
 nilp0inter
 Nisarg Jhaveri
@@ -569,6 +588,7 @@ Peter Flynn
 peterkroon
 Peter Kroon
 Philipp A
+Philipp Markovics
 Philip Stadermann
 Pi Delport
 Pierre Gerold
@@ -632,6 +652,7 @@ Scott Aikin
 Scott Goodhew
 Sebastian Wilzbach
 Sebastian Zaha
+Seren D
 Sergey Goder
 Sergey Tselovalnikov
 Se-Won Kim