templating logic
Merge branch 'master' into den-templates
config templates data
Tidied up app.js
Merge remote-tracking branch 'upstream/master'
merged from upstream
Email Template and logging dummy html
Merge remote-tracking branch 'upstream/master'
Adding template HTML
Merge branch 'den-templates'
Added comment link
Tidied up app.js
merged upstream changes
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/owzzz/hackday01-kippt
moved clips retrieval into scheduler callback
Merge pull request #13 from nacho-akqa/master

Templates logic
Merge pull request #12 from scottbert/master

Fixing up some issues with linting and making the code a bit nicer.
merged from upstream
Merge pull request #10 from robinweston/master

Tidied up app.js