update base, switch to base modals
Merge pull request #921 from mapbox/base-update

update base, switch to base modals