fixed map-data loading
Merge branch 'develop' of github.com:hhroc/traffairious into leaflet
Merge pull request #10 from citruspi/leaflet

Merging all of our leaflet work into develop