Merge branch 'dev' into feature/blog

that was FAR LESS PAINFUL!

templates/templates.go

@@ -28,11 +28,7 @@ var blogHTML string
 var blogPostHTML string
 
 var BaseTemplate = template.Must(
-    template.New("base").Funcs(
-        template.FuncMap{
-            "add": func (a int, b int) int { return a + b },
-        },
-    ).Parse(strings.Join([]string{
+    template.New("base").Parse(strings.Join([]string{
         layoutHTML,
         headerHTML,
         footerHTML,