Last batch of changes before making new template live.
Pushed once more to include database changes
Final dump before merge
Full-on merge into master of all new style, ready to publish
Final site, ready for publishing