formatting
cleanup names; fix name mapping error; resolves #10
Merge pull request #15 from mapzen/cleanup_names

Cleanup names