Merge pull request #1 from openstreetmap/master

update to master

.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
+transifex.auth
 node_modules
 npm-debug.log
 dist/*.js
 dist/*.css
 dist/img/*.svg
-transifex.auth
+data/data.js

.npmignore

@@ -0,0 +1,5 @@
+.DS_Store
+transifex.auth
+node_modules
+npm-debug.log
+data/data.js

.travis.yml

@@ -1,2 +1,9 @@
 language: node_js
 sudo: false
+before_install:
+  # https://github.com/travis-ci/travis-ci/issues/3225
+  - mkdir travis-phantomjs
+  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
+before_script: make

API.md

@@ -137,7 +137,7 @@ iD can use external presets exclusively or along with the default OpenStreetMap
 
 var iD = iD()
   .presets(customPresets)
-  .taginfo(iD.taginfo())
+  .taginfo(iD.services.taginfo())
   .imagery(iD.data.imagery);
 
 ```
@@ -152,12 +152,12 @@ Just like Presets, Imagery can be configured using the `iD().imagery` accessor.
 
 var iD = iD()
   .presets(customPresets)
-  .taginfo(iD.taginfo())
+  .taginfo(iD.services.taginfo())
   .imagery(customImagery);
 
 ```
 
-The Imagery object should follow the structure defined by [editor-imagery-index](https://github.com/osmlab/editor-imagery-index/blob/gh-pages/schema.json)
+The Imagery object should follow the structure defined by [editor-layer-index](https://github.com/osmlab/editor-layer-index/blob/gh-pages/schema.json)
 
 
 ### Taginfo
@@ -168,7 +168,7 @@ The Imagery object should follow the structure defined by [editor-imagery-index]
 
 var iD = iD()
   .presets(customPresets)
-  .taginfo(iD.taginfo().endpoint('url'))
+  .taginfo(iD.services.taginfo().endpoint('url'))
   .imagery(customImagery);
 
 ```

ARCHITECTURE.md

@@ -296,7 +296,7 @@ correspondence with entities:
   two vertices.
 * `iD.svg.Labels` renders the textual
   [labels](http://mapbox.com/osmdev/2013/02/12/labeling-id/).
-* `iD.svg.Surface` sets up a number of layers that ensure that map elements
+* `iD.svg.Layers` sets up a number of layers that ensure that map elements
   appear in an appropriate z-order.
 
 ## Other UI