refactor
Merge branch 'master' of github.com:mapzen/pelias