More content
Merge branch 'master' of github.com:vokalinteractive/whatdidalexsaytoday
Fix up templates a bit