Updates to base
Merge pull request #378 from mapbox/base-update

Updates to base