maybe the mapbox js has to be at the top?
Merge branch 'master' into gh-pages