Templates no longer escape html by default
Merge branch 'master' of github.com:Interrupt/beaufort