First shot at changing mapping
Merge branch 'node' into node-change-mapping
Merge pull request #8 from mapzen/node-change-mapping

First shot at changing mapping