More basifying
Merge branch 'mbbase' of https://github.com/mapbox/tm2 into mbbase