Pass all template data to sub-template properly
Merge branch 'master' of git://github.com/jamwaffles/Pliers