update base
Merge pull request #638 from mapbox/update-base

update base
Merge branch 'master' into docs