Feature/logic out of templates

Still a few more templates to fix, WIP.
We've included the FactoryGirl syntaxt methods so this could be converted to:
`let(:article) { create(:article, type: 'QuickAnswer' }`