Template-related methods factored out
Merge branch 'master' of github.com:punkave/apostrophe