Merge in template changes from mapbox.com.