test commit
using theirs
added mapbox functionality
commit to merge?
repaired some of what i broke while adding MB
Merge pull request #17 from chadthenderson/master

add mapbox functionality