Moved some logic into the templates
Merge branch 'master' of https://github.com/elpintar/chooseyourown