Clean up code in map.js
Re-factor to include latest version of mapbox source files
Merge pull request #34 from vreddy18/master

Code clean up; include latest version of mapbox source files