Merge branch 'map-view'
Reverted to original jshintrc

This one matches the AirBnB style guide just fine.
Merge branch 'master' into map-view