Seperates template, content, and positioning to ease future states, closes niczak/Handlebars#16
Additional clean up of template and content separation.
Resolving merge conflicts...