Add mapbox stuff
Merge branch 'cherimap' of github.com:cherimarie/beerdar into cherimap