Merging content templates, making widgets hook into appropriate new templates
Merge pull request #160 from drywall/pure-develop

The Great Template Purge of 2014