templating logic
Merge branch 'master' into den-templates
config templates data
tweaks to add linting
Merge remote-tracking branch 'upstream/master'
Email Template and logging dummy html
Merge remote-tracking branch 'upstream/master'
Adding template HTML
Merge branch 'den-templates'
tweaks to add linting
Merging issue
Added comment link
Merge remote-tracking branch 'upstream/master'
tweaks to add linting
tweaks to add linting
Merge pull request #13 from nacho-akqa/master

Templates logic
Merge issues
Merge pull request #12 from scottbert/master

Fixing up some issues with linting and making the code a bit nicer.
merged from upstream