Added MapBox
Initial mapbox support
Merge origin/master