Update default template and use a tilemill override template.
Merge pull request #2160 from mapbox/staging

TileMill layout