diff --git a/.doit.db b/.doit.db
index fdfa3ce3..1e72666a 100644
Binary files a/.doit.db and b/.doit.db differ
diff --git a/cache/.mako.tmp/__pycache__/annotation_helper.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/annotation_helper.tmpl.cpython-34.pyc
index bdcdaf09..82bdf20c 100644
Binary files a/cache/.mako.tmp/__pycache__/annotation_helper.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/annotation_helper.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/base.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/base.tmpl.cpython-34.pyc
index ef1e3c66..8df63480 100644
Binary files a/cache/.mako.tmp/__pycache__/base.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/base.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/base_helper.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/base_helper.tmpl.cpython-34.pyc
index 986c441f..46a36bb9 100644
Binary files a/cache/.mako.tmp/__pycache__/base_helper.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/base_helper.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper.tmpl.cpython-34.pyc
index 6db160e7..e0c42ac6 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_disqus.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_disqus.tmpl.cpython-34.pyc
index 5e2157b3..d669d99a 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_disqus.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_disqus.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_facebook.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_facebook.tmpl.cpython-34.pyc
index 6ad287d1..48f77ea8 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_facebook.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_facebook.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_googleplus.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_googleplus.tmpl.cpython-34.pyc
index 3b4b722e..83b247ee 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_googleplus.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_googleplus.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_intensedebate.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_intensedebate.tmpl.cpython-34.pyc
index 2f33b0ed..f2cbc532 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_intensedebate.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_intensedebate.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_isso.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_isso.tmpl.cpython-34.pyc
index c1020563..17e3b1f7 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_isso.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_isso.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_livefyre.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_livefyre.tmpl.cpython-34.pyc
index 6d3b8e2c..1d5da9a0 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_livefyre.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_livefyre.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/comments_helper_muut.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/comments_helper_muut.tmpl.cpython-34.pyc
index 0457062d..54180194 100644
Binary files a/cache/.mako.tmp/__pycache__/comments_helper_muut.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/comments_helper_muut.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/crumbs.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/crumbs.tmpl.cpython-34.pyc
index 73bda7dd..e96f8714 100644
Binary files a/cache/.mako.tmp/__pycache__/crumbs.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/crumbs.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/index.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/index.tmpl.cpython-34.pyc
index d48a34a7..4ae08029 100644
Binary files a/cache/.mako.tmp/__pycache__/index.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/index.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/index_helper.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/index_helper.tmpl.cpython-34.pyc
index 8b9279ab..bef41653 100644
Binary files a/cache/.mako.tmp/__pycache__/index_helper.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/index_helper.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/list.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/list.tmpl.cpython-34.pyc
index 4a131ebb..af074a35 100644
Binary files a/cache/.mako.tmp/__pycache__/list.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/list.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/list_post.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/list_post.tmpl.cpython-34.pyc
index d504996b..2aaf0528 100644
Binary files a/cache/.mako.tmp/__pycache__/list_post.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/list_post.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/listing.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/listing.tmpl.cpython-34.pyc
index 10f435bc..39246120 100644
Binary files a/cache/.mako.tmp/__pycache__/listing.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/listing.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/post.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/post.tmpl.cpython-34.pyc
index 7c0b6b32..e58fb93a 100644
Binary files a/cache/.mako.tmp/__pycache__/post.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/post.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/post_header.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/post_header.tmpl.cpython-34.pyc
index 74f66969..524b3519 100644
Binary files a/cache/.mako.tmp/__pycache__/post_header.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/post_header.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/post_helper.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/post_helper.tmpl.cpython-34.pyc
index 0615fb68..76a0fb6e 100644
Binary files a/cache/.mako.tmp/__pycache__/post_helper.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/post_helper.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/story.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/story.tmpl.cpython-34.pyc
index c77d972e..de78f526 100644
Binary files a/cache/.mako.tmp/__pycache__/story.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/story.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/tag.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/tag.tmpl.cpython-34.pyc
index 755e8e73..b63faa3a 100644
Binary files a/cache/.mako.tmp/__pycache__/tag.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/tag.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/__pycache__/tags.tmpl.cpython-34.pyc b/cache/.mako.tmp/__pycache__/tags.tmpl.cpython-34.pyc
index e102b197..c8f33859 100644
Binary files a/cache/.mako.tmp/__pycache__/tags.tmpl.cpython-34.pyc and b/cache/.mako.tmp/__pycache__/tags.tmpl.cpython-34.pyc differ
diff --git a/cache/.mako.tmp/annotation_helper.tmpl.py b/cache/.mako.tmp/annotation_helper.tmpl.py
index 86fc10e5..1b3b8f03 100644
--- a/cache/.mako.tmp/annotation_helper.tmpl.py
+++ b/cache/.mako.tmp/annotation_helper.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.3221245
+_modified_time = 1434160807.512545
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/annotation_helper.tmpl'
 _template_uri = 'annotation_helper.tmpl'
 _source_encoding = 'ascii'
-_exports = ['code', 'css']
+_exports = ['css', 'code']
 
 
 def render_body(context,**pageargs):
@@ -24,16 +24,6 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_code(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n    <script src="http://code.jquery.com/jquery-migrate-1.2.1.js"></script>\n    <script src="http://assets.annotateit.org/annotator/v1.2.7/annotator-full.js"></script>\n    <script>\n    jQuery(function ($) {\n        $(\'body\').annotator().annotator(\'setupPlugins\', {}, {\n            // Disable filter bar\n            Filter: false\n        });\n    });\n    </script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_css(context):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -44,8 +34,18 @@ def render_css(context):
         context.caller_stack._pop_frame()
 
 
+def render_code(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n    <script src="http://code.jquery.com/jquery-migrate-1.2.1.js"></script>\n    <script src="http://assets.annotateit.org/annotator/v1.2.7/annotator-full.js"></script>\n    <script>\n    jQuery(function ($) {\n        $(\'body\').annotator().annotator(\'setupPlugins\', {}, {\n            // Disable filter bar\n            Filter: false\n        });\n    });\n    </script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "annotation_helper.tmpl", "source_encoding": "ascii", "line_map": {"20": 3, "21": 16, "15": 0, "41": 1, "27": 5, "37": 1, "47": 41, "31": 5}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/annotation_helper.tmpl"}
+{"line_map": {"20": 3, "21": 16, "15": 0, "41": 5, "27": 1, "37": 5, "47": 41, "31": 1}, "source_encoding": "ascii", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/annotation_helper.tmpl", "uri": "annotation_helper.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/base.tmpl.py b/cache/.mako.tmp/base.tmpl.py
index bf3e4b94..4366c75c 100644
--- a/cache/.mako.tmp/base.tmpl.py
+++ b/cache/.mako.tmp/base.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2493007
+_modified_time = 1434160807.4392514
 _enable_loop = True
 _template_filename = 'themes/bootstrap3/templates/base.tmpl'
 _template_uri = 'base.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['extra_head', 'content', 'sourcelink', 'extra_js', 'belowtitle']
+_exports = ['extra_head', 'extra_js', 'sourcelink', 'belowtitle', 'content']
 
 
 def _mako_get_namespace(context, name):
@@ -19,50 +19,50 @@ def _mako_get_namespace(context, name):
         _mako_generate_namespaces(context)
         return context.namespaces[(__name__, name)]
 def _mako_generate_namespaces(context):
-    ns = runtime.TemplateNamespace('notes', context._clean_inheritance_tokens(), templateuri='annotation_helper.tmpl', callables=None,  calling_uri=_template_uri)
-    context.namespaces[(__name__, 'notes')] = ns
-
     ns = runtime.TemplateNamespace('base', context._clean_inheritance_tokens(), templateuri='base_helper.tmpl', callables=None,  calling_uri=_template_uri)
     context.namespaces[(__name__, 'base')] = ns
 
+    ns = runtime.TemplateNamespace('notes', context._clean_inheritance_tokens(), templateuri='annotation_helper.tmpl', callables=None,  calling_uri=_template_uri)
+    context.namespaces[(__name__, 'notes')] = ns
+
 def render_body(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
-        def sourcelink():
-            return render_sourcelink(context._locals(__M_locals))
-        logo_url = _import_ns.get('logo_url', context.get('logo_url', UNDEFINED))
-        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
-        post = _import_ns.get('post', context.get('post', UNDEFINED))
-        def belowtitle():
-            return render_belowtitle(context._locals(__M_locals))
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         def extra_js():
             return render_extra_js(context._locals(__M_locals))
-        lang = _import_ns.get('lang', context.get('lang', UNDEFINED))
-        base = _mako_get_namespace(context, 'base')
+        translations = _import_ns.get('translations', context.get('translations', UNDEFINED))
+        annotations = _import_ns.get('annotations', context.get('annotations', UNDEFINED))
         search_form = _import_ns.get('search_form', context.get('search_form', UNDEFINED))
-        notes = _mako_get_namespace(context, 'notes')
+        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
+        set_locale = _import_ns.get('set_locale', context.get('set_locale', UNDEFINED))
+        def belowtitle():
+            return render_belowtitle(context._locals(__M_locals))
+        momentjs_locales = _import_ns.get('momentjs_locales', context.get('momentjs_locales', UNDEFINED))
+        def sourcelink():
+            return render_sourcelink(context._locals(__M_locals))
+        abs_link = _import_ns.get('abs_link', context.get('abs_link', UNDEFINED))
+        content_footer = _import_ns.get('content_footer', context.get('content_footer', UNDEFINED))
+        template_hooks = _import_ns.get('template_hooks', context.get('template_hooks', UNDEFINED))
+        blog_title = _import_ns.get('blog_title', context.get('blog_title', UNDEFINED))
+        logo_url = _import_ns.get('logo_url', context.get('logo_url', UNDEFINED))
         def content():
             return render_content(context._locals(__M_locals))
-        abs_link = _import_ns.get('abs_link', context.get('abs_link', UNDEFINED))
-        set_locale = _import_ns.get('set_locale', context.get('set_locale', UNDEFINED))
-        show_blog_title = _import_ns.get('show_blog_title', context.get('show_blog_title', UNDEFINED))
-        date_fanciness = _import_ns.get('date_fanciness', context.get('date_fanciness', UNDEFINED))
-        body_end = _import_ns.get('body_end', context.get('body_end', UNDEFINED))
+        base = _mako_get_namespace(context, 'base')
+        lang = _import_ns.get('lang', context.get('lang', UNDEFINED))
         js_date_format = _import_ns.get('js_date_format', context.get('js_date_format', UNDEFINED))
-        len = _import_ns.get('len', context.get('len', UNDEFINED))
-        annotations = _import_ns.get('annotations', context.get('annotations', UNDEFINED))
-        template_hooks = _import_ns.get('template_hooks', context.get('template_hooks', UNDEFINED))
-        momentjs_locales = _import_ns.get('momentjs_locales', context.get('momentjs_locales', UNDEFINED))
-        content_footer = _import_ns.get('content_footer', context.get('content_footer', UNDEFINED))
-        translations = _import_ns.get('translations', context.get('translations', UNDEFINED))
-        blog_title = _import_ns.get('blog_title', context.get('blog_title', UNDEFINED))
+        date_fanciness = _import_ns.get('date_fanciness', context.get('date_fanciness', UNDEFINED))
         def extra_head():
             return render_extra_head(context._locals(__M_locals))
+        len = _import_ns.get('len', context.get('len', UNDEFINED))
+        notes = _mako_get_namespace(context, 'notes')
+        show_blog_title = _import_ns.get('show_blog_title', context.get('show_blog_title', UNDEFINED))
         show_sourcelink = _import_ns.get('show_sourcelink', context.get('show_sourcelink', UNDEFINED))
+        post = _import_ns.get('post', context.get('post', UNDEFINED))
+        body_end = _import_ns.get('body_end', context.get('body_end', UNDEFINED))
         __M_writer = context.writer()
         __M_writer('\n')
         __M_writer('\n')
@@ -162,8 +162,8 @@ def render_extra_head(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         def extra_head():
             return render_extra_head(context)
         __M_writer = context.writer()
@@ -173,14 +173,14 @@ def render_extra_head(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_content(context,**pageargs):
+def render_extra_js(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
-        def content():
-            return render_content(context)
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
+        def extra_js():
+            return render_extra_js(context)
         __M_writer = context.writer()
         return ''
     finally:
@@ -191,8 +191,8 @@ def render_sourcelink(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         def sourcelink():
             return render_sourcelink(context)
         __M_writer = context.writer()
@@ -201,31 +201,17 @@ def render_sourcelink(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_extra_js(context,**pageargs):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
-        _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
-        def extra_js():
-            return render_extra_js(context)
-        __M_writer = context.writer()
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_belowtitle(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         _import_ns = {}
-        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
         len = _import_ns.get('len', context.get('len', UNDEFINED))
+        translations = _import_ns.get('translations', context.get('translations', UNDEFINED))
         base = _mako_get_namespace(context, 'base')
         def belowtitle():
             return render_belowtitle(context)
-        translations = _import_ns.get('translations', context.get('translations', UNDEFINED))
         __M_writer = context.writer()
         __M_writer('\n')
         if len(translations) > 1:
@@ -238,8 +224,22 @@ def render_belowtitle(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_content(context,**pageargs):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        _import_ns = {}
+        _mako_get_namespace(context, 'base')._populate(_import_ns, ['*'])
+        _mako_get_namespace(context, 'notes')._populate(_import_ns, ['*'])
+        def content():
+            return render_content(context)
+        __M_writer = context.writer()
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "base.tmpl", "source_encoding": "utf-8", "line_map": {"128": 71, "129": 72, "130": 72, "131": 77, "132": 77, "133": 81, "134": 81, "135": 82, "136": 82, "137": 82, "138": 82, "190": 51, "143": 85, "144": 86, "145": 87, "146": 87, "147": 87, "148": 88, "149": 89, "22": 3, "151": 89, "152": 91, "25": 2, "154": 92, "155": 92, "28": 0, "218": 45, "150": 89, "230": 45, "161": 6, "241": 235, "170": 6, "235": 49, "176": 66, "153": 91, "67": 2, "68": 3, "69": 4, "70": 4, "71": 5, "72": 5, "204": 85, "77": 8, "78": 9, "79": 9, "80": 12, "81": 12, "82": 25, "83": 25, "84": 26, "85": 27, "86": 27, "87": 27, "88": 27, "89": 27, "90": 29, "91": 30, "92": 31, "93": 31, "94": 31, "95": 33, "96": 37, "97": 37, "98": 38, "99": 38, "100": 40, "101": 41, "102": 41, "103": 41, "104": 43, "233": 47, "234": 47, "231": 46, "109": 49, "110": 50, "111": 51, "232": 47, "116": 51, "117": 53, "118": 53, "119": 53, "120": 65, "121": 65, "126": 66, "127": 71}, "filename": "themes/bootstrap3/templates/base.tmpl"}
+{"line_map": {"128": 71, "129": 72, "130": 72, "131": 77, "132": 77, "133": 81, "134": 81, "135": 82, "136": 82, "137": 82, "138": 82, "216": 45, "190": 51, "143": 85, "144": 86, "145": 87, "146": 87, "147": 87, "148": 88, "149": 89, "22": 2, "151": 89, "152": 91, "25": 3, "154": 92, "155": 92, "28": 0, "218": 47, "150": 89, "161": 6, "219": 47, "227": 66, "220": 47, "170": 6, "221": 49, "176": 85, "153": 91, "67": 2, "68": 3, "69": 4, "70": 4, "71": 5, "72": 5, "204": 45, "77": 8, "78": 9, "79": 9, "80": 12, "81": 12, "82": 25, "83": 25, "84": 26, "85": 27, "86": 27, "87": 27, "88": 27, "89": 27, "90": 29, "91": 30, "92": 31, "93": 31, "94": 31, "95": 33, "96": 37, "97": 37, "98": 38, "99": 38, "100": 40, "101": 41, "102": 41, "103": 41, "104": 43, "109": 49, "110": 50, "111": 51, "241": 227, "116": 51, "117": 53, "118": 53, "119": 53, "120": 65, "121": 65, "217": 46, "126": 66, "127": 71}, "source_encoding": "utf-8", "filename": "themes/bootstrap3/templates/base.tmpl", "uri": "base.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/base_helper.tmpl.py b/cache/.mako.tmp/base_helper.tmpl.py
index b38905d1..4418f509 100644
--- a/cache/.mako.tmp/base_helper.tmpl.py
+++ b/cache/.mako.tmp/base_helper.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2896972
+_modified_time = 1434160807.4798486
 _enable_loop = True
 _template_filename = 'themes/bootstrap3/templates/base_helper.tmpl'
 _template_uri = 'base_helper.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['html_stylesheets', 'html_navigation_links', 'late_load_js', 'html_feedlinks', 'html_headstart', 'html_translations']
+_exports = ['html_stylesheets', 'html_headstart', 'html_translations', 'late_load_js', 'html_navigation_links', 'html_feedlinks']
 
 
 def render_body(context,**pageargs):
@@ -32,11 +32,11 @@ def render_body(context,**pageargs):
 def render_html_stylesheets(context):
     __M_caller = context.caller_stack._push_frame()
     try:
-        has_custom_css = context.get('has_custom_css', UNDEFINED)
         use_cdn = context.get('use_cdn', UNDEFINED)
+        has_custom_css = context.get('has_custom_css', UNDEFINED)
         use_bundles = context.get('use_bundles', UNDEFINED)
-        notes = context.get('notes', UNDEFINED)
         annotations = context.get('annotations', UNDEFINED)
+        notes = context.get('notes', UNDEFINED)
         post = context.get('post', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
@@ -66,144 +66,32 @@ def render_html_stylesheets(context):
         context.caller_stack._pop_frame()
 
 
-def render_html_navigation_links(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        rel_link = context.get('rel_link', UNDEFINED)
-        permalink = context.get('permalink', UNDEFINED)
-        tuple = context.get('tuple', UNDEFINED)
-        lang = context.get('lang', UNDEFINED)
-        navigation_links = context.get('navigation_links', UNDEFINED)
-        isinstance = context.get('isinstance', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        for url, text in navigation_links[lang]:
-            if isinstance(url, tuple):
-                __M_writer('            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">')
-                __M_writer(str(text))
-                __M_writer('<b class="caret"></b></a>\n            <ul class="dropdown-menu">\n')
-                for suburl, text in url:
-                    if rel_link(permalink, suburl) == "#":
-                        __M_writer('                    <li class="active"><a href="')
-                        __M_writer(str(permalink))
-                        __M_writer('">')
-                        __M_writer(str(text))
-                        __M_writer('</a>\n')
-                    else:
-                        __M_writer('                    <li><a href="')
-                        __M_writer(str(suburl))
-                        __M_writer('">')
-                        __M_writer(str(text))
-                        __M_writer('</a>\n')
-                __M_writer('            </ul>\n')
-            else:
-                if rel_link(permalink, url) == "#":
-                    __M_writer('                <li class="active"><a href="')
-                    __M_writer(str(permalink))
-                    __M_writer('">')
-                    __M_writer(str(text))
-                    __M_writer('</a>\n')
-                else:
-                    __M_writer('                <li><a href="')
-                    __M_writer(str(url))
-                    __M_writer('">')
-                    __M_writer(str(text))
-                    __M_writer('</a>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_late_load_js(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        lang = context.get('lang', UNDEFINED)
-        use_cdn = context.get('use_cdn', UNDEFINED)
-        use_bundles = context.get('use_bundles', UNDEFINED)
-        colorbox_locales = context.get('colorbox_locales', UNDEFINED)
-        social_buttons_code = context.get('social_buttons_code', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if use_bundles:
-            if use_cdn:
-                __M_writer('            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>\n            <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>\n            <script src="/assets/js/all.js"></script>\n')
-            else:
-                __M_writer('            <script src="/assets/js/all-nocdn.js"></script>\n')
-        else:
-            if use_cdn:
-                __M_writer('            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>\n            <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>\n')
-            else:
-                __M_writer('            <script src="/assets/js/jquery.min.js"></script>\n            <script src="/assets/js/bootstrap.min.js"></script>\n            <script src="/assets/js/moment-with-locales.min.js"></script>\n            <script src="/assets/js/fancydates.js"></script>\n')
-            __M_writer('        <script src="/assets/js/jquery.colorbox-min.js"></script>\n')
-        if colorbox_locales[lang]:
-            __M_writer('        <script src="/assets/js/colorbox-i18n/jquery.colorbox-')
-            __M_writer(str(colorbox_locales[lang]))
-            __M_writer('.js"></script>\n')
-        __M_writer('    ')
-        __M_writer(str(social_buttons_code))
-        __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_html_feedlinks(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        rss_link = context.get('rss_link', UNDEFINED)
-        len = context.get('len', UNDEFINED)
-        _link = context.get('_link', UNDEFINED)
-        generate_rss = context.get('generate_rss', UNDEFINED)
-        translations = context.get('translations', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if rss_link:
-            __M_writer('        ')
-            __M_writer(str(rss_link))
-            __M_writer('\n')
-        elif generate_rss:
-            if len(translations) > 1:
-                for language in translations:
-                    __M_writer('                <link rel="alternate" type="application/rss+xml" title="RSS (')
-                    __M_writer(str(language))
-                    __M_writer(')" href="')
-                    __M_writer(str(_link('rss', None, language)))
-                    __M_writer('">\n')
-            else:
-                __M_writer('            <link rel="alternate" type="application/rss+xml" title="RSS" href="')
-                __M_writer(str(_link('rss', None)))
-                __M_writer('">\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_html_headstart(context):
     __M_caller = context.caller_stack._push_frame()
     try:
-        use_open_graph = context.get('use_open_graph', UNDEFINED)
-        def html_stylesheets():
-            return render_html_stylesheets(context)
         use_cdn = context.get('use_cdn', UNDEFINED)
-        twitter_card = context.get('twitter_card', UNDEFINED)
-        striphtml = context.get('striphtml', UNDEFINED)
-        lang = context.get('lang', UNDEFINED)
-        url_replacer = context.get('url_replacer', UNDEFINED)
-        extra_head_data = context.get('extra_head_data', UNDEFINED)
+        prevlink = context.get('prevlink', UNDEFINED)
         comment_system = context.get('comment_system', UNDEFINED)
-        is_rtl = context.get('is_rtl', UNDEFINED)
-        abs_link = context.get('abs_link', UNDEFINED)
-        favicons = context.get('favicons', UNDEFINED)
-        description = context.get('description', UNDEFINED)
         title = context.get('title', UNDEFINED)
-        permalink = context.get('permalink', UNDEFINED)
         def html_feedlinks():
             return render_html_feedlinks(context)
-        nextlink = context.get('nextlink', UNDEFINED)
-        mathjax_config = context.get('mathjax_config', UNDEFINED)
-        prevlink = context.get('prevlink', UNDEFINED)
+        permalink = context.get('permalink', UNDEFINED)
+        abs_link = context.get('abs_link', UNDEFINED)
+        favicons = context.get('favicons', UNDEFINED)
         blog_title = context.get('blog_title', UNDEFINED)
+        twitter_card = context.get('twitter_card', UNDEFINED)
         comment_system_id = context.get('comment_system_id', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
+        def html_stylesheets():
+            return render_html_stylesheets(context)
+        mathjax_config = context.get('mathjax_config', UNDEFINED)
+        striphtml = context.get('striphtml', UNDEFINED)
+        extra_head_data = context.get('extra_head_data', UNDEFINED)
+        nextlink = context.get('nextlink', UNDEFINED)
+        is_rtl = context.get('is_rtl', UNDEFINED)
+        use_open_graph = context.get('use_open_graph', UNDEFINED)
+        description = context.get('description', UNDEFINED)
+        url_replacer = context.get('url_replacer', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<!DOCTYPE html>\n<html\n')
         if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'):
@@ -281,10 +169,10 @@ def render_html_headstart(context):
 def render_html_translations(context):
     __M_caller = context.caller_stack._push_frame()
     try:
-        lang = context.get('lang', UNDEFINED)
         _link = context.get('_link', UNDEFINED)
         messages = context.get('messages', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         for langname in translations.keys():
@@ -301,8 +189,120 @@ def render_html_translations(context):
         context.caller_stack._pop_frame()
 
 
+def render_late_load_js(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        social_buttons_code = context.get('social_buttons_code', UNDEFINED)
+        use_cdn = context.get('use_cdn', UNDEFINED)
+        colorbox_locales = context.get('colorbox_locales', UNDEFINED)
+        use_bundles = context.get('use_bundles', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if use_bundles:
+            if use_cdn:
+                __M_writer('            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>\n            <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>\n            <script src="/assets/js/all.js"></script>\n')
+            else:
+                __M_writer('            <script src="/assets/js/all-nocdn.js"></script>\n')
+        else:
+            if use_cdn:
+                __M_writer('            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>\n            <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>\n')
+            else:
+                __M_writer('            <script src="/assets/js/jquery.min.js"></script>\n            <script src="/assets/js/bootstrap.min.js"></script>\n            <script src="/assets/js/moment-with-locales.min.js"></script>\n            <script src="/assets/js/fancydates.js"></script>\n')
+            __M_writer('        <script src="/assets/js/jquery.colorbox-min.js"></script>\n')
+        if colorbox_locales[lang]:
+            __M_writer('        <script src="/assets/js/colorbox-i18n/jquery.colorbox-')
+            __M_writer(str(colorbox_locales[lang]))
+            __M_writer('.js"></script>\n')
+        __M_writer('    ')
+        __M_writer(str(social_buttons_code))
+        __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_html_navigation_links(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        navigation_links = context.get('navigation_links', UNDEFINED)
+        isinstance = context.get('isinstance', UNDEFINED)
+        tuple = context.get('tuple', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
+        rel_link = context.get('rel_link', UNDEFINED)
+        permalink = context.get('permalink', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        for url, text in navigation_links[lang]:
+            if isinstance(url, tuple):
+                __M_writer('            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">')
+                __M_writer(str(text))
+                __M_writer('<b class="caret"></b></a>\n            <ul class="dropdown-menu">\n')
+                for suburl, text in url:
+                    if rel_link(permalink, suburl) == "#":
+                        __M_writer('                    <li class="active"><a href="')
+                        __M_writer(str(permalink))
+                        __M_writer('">')
+                        __M_writer(str(text))
+                        __M_writer('</a>\n')
+                    else:
+                        __M_writer('                    <li><a href="')
+                        __M_writer(str(suburl))
+                        __M_writer('">')
+                        __M_writer(str(text))
+                        __M_writer('</a>\n')
+                __M_writer('            </ul>\n')
+            else:
+                if rel_link(permalink, url) == "#":
+                    __M_writer('                <li class="active"><a href="')
+                    __M_writer(str(permalink))
+                    __M_writer('">')
+                    __M_writer(str(text))
+                    __M_writer('</a>\n')
+                else:
+                    __M_writer('                <li><a href="')
+                    __M_writer(str(url))
+                    __M_writer('">')
+                    __M_writer(str(text))
+                    __M_writer('</a>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_html_feedlinks(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        rss_link = context.get('rss_link', UNDEFINED)
+        len = context.get('len', UNDEFINED)
+        generate_rss = context.get('generate_rss', UNDEFINED)
+        translations = context.get('translations', UNDEFINED)
+        _link = context.get('_link', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if rss_link:
+            __M_writer('        ')
+            __M_writer(str(rss_link))
+            __M_writer('\n')
+        elif generate_rss:
+            if len(translations) > 1:
+                for language in translations:
+                    __M_writer('                <link rel="alternate" type="application/rss+xml" title="RSS (')
+                    __M_writer(str(language))
+                    __M_writer(')" href="')
+                    __M_writer(str(_link('rss', None, language)))
+                    __M_writer('">\n')
+            else:
+                __M_writer('            <link rel="alternate" type="application/rss+xml" title="RSS" href="')
+                __M_writer(str(_link('rss', None)))
+                __M_writer('">\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "base_helper.tmpl", "source_encoding": "utf-8", "line_map": {"15": 0, "20": 2, "21": 65, "22": 92, "23": 122, "24": 145, "25": 159, "26": 167, "32": 95, "42": 95, "43": 96, "44": 97, "45": 98, "46": 100, "47": 101, "48": 103, "49": 104, "50": 105, "51": 106, "52": 107, "53": 109, "54": 113, "55": 114, "56": 117, "57": 118, "58": 118, "59": 118, "60": 119, "61": 120, "62": 120, "63": 120, "69": 124, "79": 124, "80": 125, "81": 126, "82": 127, "83": 127, "84": 127, "85": 129, "86": 130, "87": 131, "88": 131, "89": 131, "90": 131, "91": 131, "92": 132, "93": 133, "94": 133, "95": 133, "96": 133, "97": 133, "98": 136, "99": 137, "100": 138, "101": 139, "102": 139, "103": 139, "104": 139, "105": 139, "106": 140, "107": 141, "108": 141, "109": 141, "110": 141, "111": 141, "117": 67, "126": 67, "127": 68, "128": 69, "129": 70, "130": 73, "131": 74, "132": 76, "133": 77, "134": 78, "135": 80, "136": 81, "137": 86, "138": 88, "139": 89, "140": 89, "141": 89, "142": 91, "143": 91, "144": 91, "150": 147, "159": 147, "160": 148, "161": 149, "162": 149, "163": 149, "164": 150, "165": 151, "166": 152, "167": 153, "168": 153, "169": 153, "170": 153, "171": 153, "172": 155, "173": 156, "174": 156, "175": 156, "181": 3, "208": 3, "209": 7, "210": 8, "211": 9, "212": 10, "213": 12, "214": 13, "215": 15, "216": 16, "217": 18, "218": 21, "219": 22, "220": 25, "221": 25, "222": 25, "223": 28, "224": 29, "225": 29, "226": 29, "227": 31, "228": 32, "229": 32, "230": 32, "231": 32, "232": 34, "233": 34, "234": 35, "235": 35, "236": 36, "237": 37, "238": 37, "239": 37, "240": 39, "241": 40, "242": 41, "243": 42, "244": 42, "245": 42, "246": 42, "247": 42, "248": 42, "249": 42, "250": 45, "251": 46, "252": 47, "253": 47, "254": 47, "255": 49, "256": 50, "257": 51, "258": 51, "259": 51, "260": 53, "261": 54, "262": 54, "263": 54, "264": 56, "265": 57, "266": 57, "267": 58, "268": 59, "269": 60, "270": 61, "271": 61, "272": 61, "273": 63, "274": 64, "275": 64, "281": 161, "289": 161, "290": 162, "291": 163, "292": 164, "293": 164, "294": 164, "295": 164, "296": 164, "297": 164, "298": 164, "304": 298}, "filename": "themes/bootstrap3/templates/base_helper.tmpl"}
+{"line_map": {"15": 0, "20": 2, "21": 65, "22": 92, "23": 122, "24": 145, "25": 159, "26": 167, "32": 95, "42": 95, "43": 96, "44": 97, "45": 98, "46": 100, "47": 101, "48": 103, "49": 104, "50": 105, "51": 106, "52": 107, "53": 109, "54": 113, "55": 114, "56": 117, "57": 118, "58": 118, "59": 118, "60": 119, "61": 120, "62": 120, "63": 120, "69": 3, "96": 3, "97": 7, "98": 8, "99": 9, "100": 10, "101": 12, "102": 13, "103": 15, "104": 16, "105": 18, "106": 21, "107": 22, "108": 25, "109": 25, "110": 25, "111": 28, "112": 29, "113": 29, "114": 29, "115": 31, "116": 32, "117": 32, "118": 32, "119": 32, "120": 34, "121": 34, "122": 35, "123": 35, "124": 36, "125": 37, "126": 37, "127": 37, "128": 39, "129": 40, "130": 41, "131": 42, "132": 42, "133": 42, "134": 42, "135": 42, "136": 42, "137": 42, "138": 45, "139": 46, "140": 47, "141": 47, "142": 47, "143": 49, "144": 50, "145": 51, "146": 51, "147": 51, "148": 53, "149": 54, "150": 54, "151": 54, "152": 56, "153": 57, "154": 57, "155": 58, "156": 59, "157": 60, "158": 61, "159": 61, "160": 61, "161": 63, "162": 64, "163": 64, "169": 161, "177": 161, "178": 162, "179": 163, "180": 164, "181": 164, "182": 164, "183": 164, "184": 164, "185": 164, "186": 164, "192": 67, "201": 67, "202": 68, "203": 69, "204": 70, "205": 73, "206": 74, "207": 76, "208": 77, "209": 78, "210": 80, "211": 81, "212": 86, "213": 88, "214": 89, "215": 89, "216": 89, "217": 91, "218": 91, "219": 91, "225": 124, "235": 124, "236": 125, "237": 126, "238": 127, "239": 127, "240": 127, "241": 129, "242": 130, "243": 131, "244": 131, "245": 131, "246": 131, "247": 131, "248": 132, "249": 133, "250": 133, "251": 133, "252": 133, "253": 133, "254": 136, "255": 137, "256": 138, "257": 139, "258": 139, "259": 139, "260": 139, "261": 139, "262": 140, "263": 141, "264": 141, "265": 141, "266": 141, "267": 141, "273": 147, "282": 147, "283": 148, "284": 149, "285": 149, "286": 149, "287": 150, "288": 151, "289": 152, "290": 153, "291": 153, "292": 153, "293": 153, "294": 153, "295": 155, "296": 156, "297": 156, "298": 156, "304": 298}, "source_encoding": "utf-8", "filename": "themes/bootstrap3/templates/base_helper.tmpl", "uri": "base_helper.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper.tmpl.py b/cache/.mako.tmp/comments_helper.tmpl.py
index dfbe1938..ae057de0 100644
--- a/cache/.mako.tmp/comments_helper.tmpl.py
+++ b/cache/.mako.tmp/comments_helper.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.16348
+_modified_time = 1434160807.35277
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper.tmpl'
 _template_uri = 'comments_helper.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def _mako_get_namespace(context, name):
@@ -22,23 +22,23 @@ def _mako_generate_namespaces(context):
     ns = runtime.TemplateNamespace('muut', context._clean_inheritance_tokens(), templateuri='comments_helper_muut.tmpl', callables=None,  calling_uri=_template_uri)
     context.namespaces[(__name__, 'muut')] = ns
 
+    ns = runtime.TemplateNamespace('googleplus', context._clean_inheritance_tokens(), templateuri='comments_helper_googleplus.tmpl', callables=None,  calling_uri=_template_uri)
+    context.namespaces[(__name__, 'googleplus')] = ns
+
     ns = runtime.TemplateNamespace('disqus', context._clean_inheritance_tokens(), templateuri='comments_helper_disqus.tmpl', callables=None,  calling_uri=_template_uri)
     context.namespaces[(__name__, 'disqus')] = ns
 
-    ns = runtime.TemplateNamespace('facebook', context._clean_inheritance_tokens(), templateuri='comments_helper_facebook.tmpl', callables=None,  calling_uri=_template_uri)
-    context.namespaces[(__name__, 'facebook')] = ns
-
-    ns = runtime.TemplateNamespace('intensedebate', context._clean_inheritance_tokens(), templateuri='comments_helper_intensedebate.tmpl', callables=None,  calling_uri=_template_uri)
-    context.namespaces[(__name__, 'intensedebate')] = ns
-
-    ns = runtime.TemplateNamespace('livefyre', context._clean_inheritance_tokens(), templateuri='comments_helper_livefyre.tmpl', callables=None,  calling_uri=_template_uri)
-    context.namespaces[(__name__, 'livefyre')] = ns
-
     ns = runtime.TemplateNamespace('isso', context._clean_inheritance_tokens(), templateuri='comments_helper_isso.tmpl', callables=None,  calling_uri=_template_uri)
     context.namespaces[(__name__, 'isso')] = ns
 
-    ns = runtime.TemplateNamespace('googleplus', context._clean_inheritance_tokens(), templateuri='comments_helper_googleplus.tmpl', callables=None,  calling_uri=_template_uri)
-    context.namespaces[(__name__, 'googleplus')] = ns
+    ns = runtime.TemplateNamespace('intensedebate', context._clean_inheritance_tokens(), templateuri='comments_helper_intensedebate.tmpl', callables=None,  calling_uri=_template_uri)
+    context.namespaces[(__name__, 'intensedebate')] = ns
+
+    ns = runtime.TemplateNamespace('facebook', context._clean_inheritance_tokens(), templateuri='comments_helper_facebook.tmpl', callables=None,  calling_uri=_template_uri)
+    context.namespaces[(__name__, 'facebook')] = ns
+
+    ns = runtime.TemplateNamespace('livefyre', context._clean_inheritance_tokens(), templateuri='comments_helper_livefyre.tmpl', callables=None,  calling_uri=_template_uri)
+    context.namespaces[(__name__, 'livefyre')] = ns
 
 def render_body(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
@@ -61,109 +61,17 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_comment_form(context,url,title,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        muut = _mako_get_namespace(context, 'muut')
-        livefyre = _mako_get_namespace(context, 'livefyre')
-        isso = _mako_get_namespace(context, 'isso')
-        disqus = _mako_get_namespace(context, 'disqus')
-        facebook = _mako_get_namespace(context, 'facebook')
-        intensedebate = _mako_get_namespace(context, 'intensedebate')
-        comment_system = context.get('comment_system', UNDEFINED)
-        googleplus = _mako_get_namespace(context, 'googleplus')
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system == 'disqus':
-            __M_writer('        ')
-            __M_writer(str(disqus.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'livefyre':
-            __M_writer('        ')
-            __M_writer(str(livefyre.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'intensedebate':
-            __M_writer('        ')
-            __M_writer(str(intensedebate.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'muut':
-            __M_writer('        ')
-            __M_writer(str(muut.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'googleplus':
-            __M_writer('        ')
-            __M_writer(str(googleplus.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'facebook':
-            __M_writer('        ')
-            __M_writer(str(facebook.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        elif comment_system == 'isso':
-            __M_writer('        ')
-            __M_writer(str(isso.comment_form(url, title, identifier)))
-            __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        muut = _mako_get_namespace(context, 'muut')
-        livefyre = _mako_get_namespace(context, 'livefyre')
-        isso = _mako_get_namespace(context, 'isso')
-        disqus = _mako_get_namespace(context, 'disqus')
-        intensedebate = _mako_get_namespace(context, 'intensedebate')
-        facebook = _mako_get_namespace(context, 'facebook')
-        comment_system = context.get('comment_system', UNDEFINED)
-        googleplus = _mako_get_namespace(context, 'googleplus')
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system == 'disqus':
-            __M_writer('        ')
-            __M_writer(str(disqus.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'livefyre':
-            __M_writer('        ')
-            __M_writer(str(livefyre.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'intensedebate':
-            __M_writer('        ')
-            __M_writer(str(intensedebate.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'muut':
-            __M_writer('        ')
-            __M_writer(str(muut.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'googleplus':
-            __M_writer('        ')
-            __M_writer(str(googleplus.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'facebook':
-            __M_writer('        ')
-            __M_writer(str(facebook.comment_link_script()))
-            __M_writer('\n')
-        elif comment_system == 'isso':
-            __M_writer('        ')
-            __M_writer(str(isso.comment_link_script()))
-            __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_comment_link(context,link,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
         muut = _mako_get_namespace(context, 'muut')
-        livefyre = _mako_get_namespace(context, 'livefyre')
-        isso = _mako_get_namespace(context, 'isso')
-        disqus = _mako_get_namespace(context, 'disqus')
-        facebook = _mako_get_namespace(context, 'facebook')
-        intensedebate = _mako_get_namespace(context, 'intensedebate')
-        comment_system = context.get('comment_system', UNDEFINED)
         googleplus = _mako_get_namespace(context, 'googleplus')
+        isso = _mako_get_namespace(context, 'isso')
+        intensedebate = _mako_get_namespace(context, 'intensedebate')
+        disqus = _mako_get_namespace(context, 'disqus')
+        comment_system = context.get('comment_system', UNDEFINED)
+        facebook = _mako_get_namespace(context, 'facebook')
+        livefyre = _mako_get_namespace(context, 'livefyre')
         __M_writer = context.writer()
         __M_writer('\n')
         if comment_system == 'disqus':
@@ -199,8 +107,100 @@ def render_comment_link(context,link,identifier):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        muut = _mako_get_namespace(context, 'muut')
+        googleplus = _mako_get_namespace(context, 'googleplus')
+        isso = _mako_get_namespace(context, 'isso')
+        disqus = _mako_get_namespace(context, 'disqus')
+        intensedebate = _mako_get_namespace(context, 'intensedebate')
+        comment_system = context.get('comment_system', UNDEFINED)
+        facebook = _mako_get_namespace(context, 'facebook')
+        livefyre = _mako_get_namespace(context, 'livefyre')
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system == 'disqus':
+            __M_writer('        ')
+            __M_writer(str(disqus.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'livefyre':
+            __M_writer('        ')
+            __M_writer(str(livefyre.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'intensedebate':
+            __M_writer('        ')
+            __M_writer(str(intensedebate.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'muut':
+            __M_writer('        ')
+            __M_writer(str(muut.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'googleplus':
+            __M_writer('        ')
+            __M_writer(str(googleplus.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'facebook':
+            __M_writer('        ')
+            __M_writer(str(facebook.comment_link_script()))
+            __M_writer('\n')
+        elif comment_system == 'isso':
+            __M_writer('        ')
+            __M_writer(str(isso.comment_link_script()))
+            __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_form(context,url,title,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        muut = _mako_get_namespace(context, 'muut')
+        googleplus = _mako_get_namespace(context, 'googleplus')
+        isso = _mako_get_namespace(context, 'isso')
+        disqus = _mako_get_namespace(context, 'disqus')
+        intensedebate = _mako_get_namespace(context, 'intensedebate')
+        comment_system = context.get('comment_system', UNDEFINED)
+        facebook = _mako_get_namespace(context, 'facebook')
+        livefyre = _mako_get_namespace(context, 'livefyre')
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system == 'disqus':
+            __M_writer('        ')
+            __M_writer(str(disqus.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'livefyre':
+            __M_writer('        ')
+            __M_writer(str(livefyre.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'intensedebate':
+            __M_writer('        ')
+            __M_writer(str(intensedebate.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'muut':
+            __M_writer('        ')
+            __M_writer(str(muut.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'googleplus':
+            __M_writer('        ')
+            __M_writer(str(googleplus.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'facebook':
+            __M_writer('        ')
+            __M_writer(str(facebook.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        elif comment_system == 'isso':
+            __M_writer('        ')
+            __M_writer(str(isso.comment_form(url, title, identifier)))
+            __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper.tmpl", "source_encoding": "utf-8", "line_map": {"22": 6, "25": 3, "28": 8, "31": 5, "34": 4, "37": 9, "40": 7, "43": 0, "48": 2, "49": 3, "50": 4, "51": 5, "52": 6, "53": 7, "54": 8, "55": 9, "56": 27, "57": 45, "58": 63, "64": 11, "76": 11, "77": 12, "78": 13, "79": 13, "80": 13, "81": 14, "82": 15, "83": 15, "84": 15, "85": 16, "86": 17, "87": 17, "88": 17, "89": 18, "90": 19, "91": 19, "92": 19, "93": 20, "94": 21, "95": 21, "96": 21, "97": 22, "98": 23, "99": 23, "100": 23, "101": 24, "102": 25, "103": 25, "104": 25, "110": 47, "122": 47, "123": 48, "124": 49, "125": 49, "126": 49, "127": 50, "128": 51, "129": 51, "130": 51, "131": 52, "132": 53, "133": 53, "134": 53, "135": 54, "136": 55, "137": 55, "138": 55, "139": 56, "140": 57, "141": 57, "142": 57, "143": 58, "144": 59, "145": 59, "146": 59, "147": 60, "148": 61, "149": 61, "150": 61, "156": 29, "168": 29, "169": 30, "170": 31, "171": 31, "172": 31, "173": 32, "174": 33, "175": 33, "176": 33, "177": 34, "178": 35, "179": 35, "180": 35, "181": 36, "182": 37, "183": 37, "184": 37, "185": 38, "186": 39, "187": 39, "188": 39, "189": 40, "190": 41, "191": 41, "192": 41, "193": 42, "194": 43, "195": 43, "196": 43, "202": 196}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper.tmpl"}
+{"line_map": {"22": 6, "25": 7, "28": 3, "31": 9, "34": 5, "37": 8, "40": 4, "43": 0, "48": 2, "49": 3, "50": 4, "51": 5, "52": 6, "53": 7, "54": 8, "55": 9, "56": 27, "57": 45, "58": 63, "64": 29, "76": 29, "77": 30, "78": 31, "79": 31, "80": 31, "81": 32, "82": 33, "83": 33, "84": 33, "85": 34, "86": 35, "87": 35, "88": 35, "89": 36, "90": 37, "91": 37, "92": 37, "93": 38, "94": 39, "95": 39, "96": 39, "97": 40, "98": 41, "99": 41, "100": 41, "101": 42, "102": 43, "103": 43, "104": 43, "110": 47, "122": 47, "123": 48, "124": 49, "125": 49, "126": 49, "127": 50, "128": 51, "129": 51, "130": 51, "131": 52, "132": 53, "133": 53, "134": 53, "135": 54, "136": 55, "137": 55, "138": 55, "139": 56, "140": 57, "141": 57, "142": 57, "143": 58, "144": 59, "145": 59, "146": 59, "147": 60, "148": 61, "149": 61, "150": 61, "156": 11, "168": 11, "169": 12, "170": 13, "171": 13, "172": 13, "173": 14, "174": 15, "175": 15, "176": 15, "177": 16, "178": 17, "179": 17, "180": 17, "181": 18, "182": 19, "183": 19, "184": 19, "185": 20, "186": 21, "187": 21, "188": 21, "189": 22, "190": 23, "191": 23, "192": 23, "193": 24, "194": 25, "195": 25, "196": 25, "202": 196}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper.tmpl", "uri": "comments_helper.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_disqus.tmpl.py b/cache/.mako.tmp/comments_helper_disqus.tmpl.py
index 359b38d4..112bce6b 100644
--- a/cache/.mako.tmp/comments_helper_disqus.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_disqus.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.187784
+_modified_time = 1434160807.3774314
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_disqus.tmpl'
 _template_uri = 'comments_helper_disqus.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 import json 
@@ -29,11 +29,43 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link(context,link,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system_id:
+            __M_writer('    <a href="')
+            __M_writer(str(link))
+            __M_writer('#disqus_thread" data-disqus-identifier="')
+            __M_writer(str(identifier))
+            __M_writer('">Comments</a>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system_id:
+            __M_writer('       <script>var disqus_shortname="')
+            __M_writer(str(comment_system_id))
+            __M_writer('";(function(){var a=document.createElement("script");a.async=true;a.src="//"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_comment_form(context,url,title,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
-        lang = context.get('lang', UNDEFINED)
         comment_system_id = context.get('comment_system_id', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         if comment_system_id:
@@ -61,40 +93,8 @@ def render_comment_form(context,url,title,identifier):
         context.caller_stack._pop_frame()
 
 
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system_id:
-            __M_writer('       <script>var disqus_shortname="')
-            __M_writer(str(comment_system_id))
-            __M_writer('";(function(){var a=document.createElement("script");a.async=true;a.src="//"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)}());</script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link(context,link,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system_id:
-            __M_writer('    <a href="')
-            __M_writer(str(link))
-            __M_writer('#disqus_thread" data-disqus-identifier="')
-            __M_writer(str(identifier))
-            __M_writer('">Comments</a>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_disqus.tmpl", "source_encoding": "utf-8", "line_map": {"15": 3, "17": 0, "22": 2, "23": 3, "24": 31, "25": 37, "26": 44, "32": 5, "38": 5, "39": 6, "40": 7, "41": 9, "42": 9, "43": 10, "44": 11, "45": 11, "46": 11, "47": 13, "48": 13, "49": 13, "50": 14, "51": 14, "52": 16, "53": 17, "54": 18, "55": 19, "56": 19, "57": 19, "58": 21, "64": 40, "69": 40, "70": 41, "71": 42, "72": 42, "73": 42, "79": 33, "84": 33, "85": 34, "86": 35, "87": 35, "88": 35, "89": 35, "90": 35, "96": 90}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_disqus.tmpl"}
+{"line_map": {"15": 3, "17": 0, "22": 2, "23": 3, "24": 31, "25": 37, "26": 44, "32": 33, "37": 33, "38": 34, "39": 35, "40": 35, "41": 35, "42": 35, "43": 35, "49": 40, "54": 40, "55": 41, "56": 42, "57": 42, "58": 42, "64": 5, "70": 5, "71": 6, "72": 7, "73": 9, "74": 9, "75": 10, "76": 11, "77": 11, "78": 11, "79": 13, "80": 13, "81": 13, "82": 14, "83": 14, "84": 16, "85": 17, "86": 18, "87": 19, "88": 19, "89": 19, "90": 21, "96": 90}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_disqus.tmpl", "uri": "comments_helper_disqus.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_facebook.tmpl.py b/cache/.mako.tmp/comments_helper_facebook.tmpl.py
index e821865e..c3d564aa 100644
--- a/cache/.mako.tmp/comments_helper_facebook.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_facebook.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.226017
+_modified_time = 1434160807.415945
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_facebook.tmpl'
 _template_uri = 'comments_helper_facebook.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -25,6 +25,31 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link(context,link,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n<span class="fb-comments-count" data-url="')
+        __M_writer(str(link))
+        __M_writer('">\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n<div id="fb-root"></div>\n<script>\n    // thank lxml for this\n    $(\'.fb-comments-count\').each(function(i, obj) {\n        var url = obj.attributes[\'data-url\'].value;\n        // change here if you dislike the default way of displaying\n        // this\n        obj.innerHTML = \'<fb:comments-count href="\' + url + \'"></fb:comments-count> comments\';\n    });\n\n  window.fbAsyncInit = function() {\n    // init the FB JS SDK\n    FB.init({\n      appId      : \'')
+        __M_writer(str(comment_system_id))
+        __M_writer('\',\n      status     : true,\n      xfbml      : true\n    });\n\n  };\n\n  // Load the SDK asynchronously\n  (function(d, s, id){\n     var js, fjs = d.getElementsByTagName(s)[0];\n     if (d.getElementById(id)) {return;}\n     js = d.createElement(s); js.id = id;\n     js.src = "//connect.facebook.net/en_US/all.js";\n     fjs.parentNode.insertBefore(js, fjs);\n   }(document, \'script\', \'facebook-jssdk\'));\n</script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_comment_form(context,url,title,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -40,33 +65,8 @@ def render_comment_form(context,url,title,identifier):
         context.caller_stack._pop_frame()
 
 
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n<div id="fb-root"></div>\n<script>\n    // thank lxml for this\n    $(\'.fb-comments-count\').each(function(i, obj) {\n        var url = obj.attributes[\'data-url\'].value;\n        // change here if you dislike the default way of displaying\n        // this\n        obj.innerHTML = \'<fb:comments-count href="\' + url + \'"></fb:comments-count> comments\';\n    });\n\n  window.fbAsyncInit = function() {\n    // init the FB JS SDK\n    FB.init({\n      appId      : \'')
-        __M_writer(str(comment_system_id))
-        __M_writer('\',\n      status     : true,\n      xfbml      : true\n    });\n\n  };\n\n  // Load the SDK asynchronously\n  (function(d, s, id){\n     var js, fjs = d.getElementsByTagName(s)[0];\n     if (d.getElementById(id)) {return;}\n     js = d.createElement(s); js.id = id;\n     js.src = "//connect.facebook.net/en_US/all.js";\n     fjs.parentNode.insertBefore(js, fjs);\n   }(document, \'script\', \'facebook-jssdk\'));\n</script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link(context,link,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n<span class="fb-comments-count" data-url="')
-        __M_writer(str(link))
-        __M_writer('">\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_facebook.tmpl", "source_encoding": "utf-8", "line_map": {"33": 2, "34": 8, "35": 8, "36": 25, "37": 25, "60": 28, "43": 32, "15": 0, "48": 32, "49": 46, "50": 46, "20": 26, "21": 30, "22": 62, "56": 28, "68": 62, "28": 2, "61": 29, "62": 29}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_facebook.tmpl"}
+{"line_map": {"32": 28, "33": 29, "34": 29, "59": 8, "68": 62, "40": 32, "60": 8, "45": 32, "46": 46, "15": 0, "20": 26, "21": 30, "22": 62, "58": 2, "47": 46, "28": 28, "61": 25, "62": 25, "53": 2}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_facebook.tmpl", "uri": "comments_helper_facebook.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_googleplus.tmpl.py b/cache/.mako.tmp/comments_helper_googleplus.tmpl.py
index 4b74bfc7..bda44e7e 100644
--- a/cache/.mako.tmp/comments_helper_googleplus.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_googleplus.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2200818
+_modified_time = 1434160807.4099903
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl'
 _template_uri = 'comments_helper_googleplus.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -25,28 +25,6 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_comment_form(context,url,title,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n<script src="https://apis.google.com/js/plusone.js"></script>\n<div class="g-comments"\n    data-href="')
-        __M_writer(str(url))
-        __M_writer('"\n    data-first_party_property="BLOGGER"\n    data-view_type="FILTERED_POSTMOD">\n</div>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_comment_link(context,link,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -59,8 +37,30 @@ def render_comment_link(context,link,identifier):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_form(context,url,title,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n<script src="https://apis.google.com/js/plusone.js"></script>\n<div class="g-comments"\n    data-href="')
+        __M_writer(str(url))
+        __M_writer('"\n    data-first_party_property="BLOGGER"\n    data-view_type="FILTERED_POSTMOD">\n</div>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_googleplus.tmpl", "source_encoding": "utf-8", "line_map": {"32": 2, "33": 5, "34": 5, "54": 11, "40": 16, "44": 16, "15": 0, "50": 11, "20": 9, "21": 14, "22": 17, "55": 12, "56": 12, "28": 2, "62": 56}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl"}
+{"line_map": {"32": 11, "33": 12, "34": 12, "54": 2, "40": 16, "44": 16, "15": 0, "50": 2, "20": 9, "21": 14, "22": 17, "55": 5, "56": 5, "28": 11, "62": 56}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl", "uri": "comments_helper_googleplus.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_intensedebate.tmpl.py b/cache/.mako.tmp/comments_helper_intensedebate.tmpl.py
index d7bf5e89..db466540 100644
--- a/cache/.mako.tmp/comments_helper_intensedebate.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_intensedebate.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2056937
+_modified_time = 1434160807.395432
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_intensedebate.tmpl'
 _template_uri = 'comments_helper_intensedebate.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -25,33 +25,6 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_comment_form(context,url,title,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer("\n<script>\nvar idcomments_acct = '")
-        __M_writer(str(comment_system_id))
-        __M_writer('\';\nvar idcomments_post_id = "')
-        __M_writer(str(identifier))
-        __M_writer('";\nvar idcomments_post_url = "')
-        __M_writer(str(url))
-        __M_writer('";\n</script>\n<span id="IDCommentsPostTitle" style="display:none"></span>\n<script src=\'http://www.intensedebate.com/js/genericCommentWrapperV2.js\'></script>\n</script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_comment_link(context,link,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -73,8 +46,35 @@ def render_comment_link(context,link,identifier):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_form(context,url,title,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer("\n<script>\nvar idcomments_acct = '")
+        __M_writer(str(comment_system_id))
+        __M_writer('\';\nvar idcomments_post_id = "')
+        __M_writer(str(identifier))
+        __M_writer('";\nvar idcomments_post_url = "')
+        __M_writer(str(url))
+        __M_writer('";\n</script>\n<span id="IDCommentsPostTitle" style="display:none"></span>\n<script src=\'http://www.intensedebate.com/js/genericCommentWrapperV2.js\'></script>\n</script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_intensedebate.tmpl", "source_encoding": "utf-8", "line_map": {"64": 14, "65": 16, "66": 16, "67": 17, "68": 17, "69": 18, "70": 18, "76": 70, "15": 0, "20": 11, "21": 22, "22": 25, "28": 2, "33": 2, "34": 4, "35": 4, "36": 5, "37": 5, "38": 6, "39": 6, "45": 24, "49": 24, "55": 13, "60": 13, "61": 14, "62": 14, "63": 14}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_intensedebate.tmpl"}
+{"line_map": {"64": 2, "65": 4, "66": 4, "67": 5, "68": 5, "69": 6, "70": 6, "76": 70, "15": 0, "20": 11, "21": 22, "22": 25, "28": 13, "33": 13, "34": 14, "35": 14, "36": 14, "37": 14, "38": 16, "39": 16, "40": 17, "41": 17, "42": 18, "43": 18, "49": 24, "53": 24, "59": 2}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_intensedebate.tmpl", "uri": "comments_helper_intensedebate.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_isso.tmpl.py b/cache/.mako.tmp/comments_helper_isso.tmpl.py
index 5429a495..aa16126b 100644
--- a/cache/.mako.tmp/comments_helper_isso.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_isso.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2338803
+_modified_time = 1434160807.4238615
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_isso.tmpl'
 _template_uri = 'comments_helper_isso.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -25,6 +25,38 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link(context,link,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system_id:
+            __M_writer('        <a href="')
+            __M_writer(str(link))
+            __M_writer('#isso-thread">Comments</a>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if comment_system_id:
+            __M_writer('        <script src="')
+            __M_writer(str(comment_system_id))
+            __M_writer('js/count.min.js" data-isso="')
+            __M_writer(str(comment_system_id))
+            __M_writer('"></script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_comment_form(context,url,title,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -44,40 +76,8 @@ def render_comment_form(context,url,title,identifier):
         context.caller_stack._pop_frame()
 
 
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system_id:
-            __M_writer('        <script src="')
-            __M_writer(str(comment_system_id))
-            __M_writer('js/count.min.js" data-isso="')
-            __M_writer(str(comment_system_id))
-            __M_writer('"></script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link(context,link,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if comment_system_id:
-            __M_writer('        <a href="')
-            __M_writer(str(link))
-            __M_writer('#isso-thread">Comments</a>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_isso.tmpl", "source_encoding": "utf-8", "line_map": {"64": 9, "69": 9, "70": 10, "71": 11, "72": 11, "73": 11, "15": 0, "20": 7, "21": 13, "22": 20, "79": 73, "28": 2, "33": 2, "34": 3, "35": 4, "36": 4, "37": 4, "38": 5, "39": 5, "40": 5, "41": 5, "47": 16, "52": 16, "53": 17, "54": 18, "55": 18, "56": 18, "57": 18, "58": 18}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_isso.tmpl"}
+{"line_map": {"65": 2, "66": 3, "67": 4, "68": 4, "69": 4, "70": 5, "71": 5, "72": 5, "73": 5, "15": 0, "20": 7, "21": 13, "22": 20, "79": 73, "28": 9, "33": 9, "34": 10, "35": 11, "36": 11, "37": 11, "43": 16, "48": 16, "49": 17, "50": 18, "51": 18, "52": 18, "53": 18, "54": 18, "60": 2}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_isso.tmpl", "uri": "comments_helper_isso.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_livefyre.tmpl.py b/cache/.mako.tmp/comments_helper_livefyre.tmpl.py
index 17b64c34..4178a7c2 100644
--- a/cache/.mako.tmp/comments_helper_livefyre.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_livefyre.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.1980112
+_modified_time = 1434160807.3876421
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_livefyre.tmpl'
 _template_uri = 'comments_helper_livefyre.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -25,31 +25,6 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_comment_form(context,url,title,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        comment_system_id = context.get('comment_system_id', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n<div id="livefyre-comments"></div>\n<script src="http://zor.livefyre.com/wjs/v3.0/javascripts/livefyre.js"></script>\n<script>\n(function () {\n    var articleId = "')
-        __M_writer(str(identifier))
-        __M_writer('";\n    fyre.conv.load({}, [{\n        el: \'livefyre-comments\',\n        network: "livefyre.com",\n        siteId: "')
-        __M_writer(str(comment_system_id))
-        __M_writer('",\n        articleId: articleId,\n        signed: false,\n        collectionMeta: {\n            articleId: articleId,\n            url: fyre.conv.load.makeCollectionUrl(),\n        }\n    }], function() {});\n}());\n</script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n<script src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js"></script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_comment_link(context,link,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -67,8 +42,33 @@ def render_comment_link(context,link,identifier):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n<script src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js"></script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_form(context,url,title,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        comment_system_id = context.get('comment_system_id', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n<div id="livefyre-comments"></div>\n<script src="http://zor.livefyre.com/wjs/v3.0/javascripts/livefyre.js"></script>\n<script>\n(function () {\n    var articleId = "')
+        __M_writer(str(identifier))
+        __M_writer('";\n    fyre.conv.load({}, [{\n        el: \'livefyre-comments\',\n        network: "livefyre.com",\n        siteId: "')
+        __M_writer(str(comment_system_id))
+        __M_writer('",\n        articleId: articleId,\n        signed: false,\n        collectionMeta: {\n            articleId: articleId,\n            url: fyre.conv.load.makeCollectionUrl(),\n        }\n    }], function() {});\n}());\n</script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_livefyre.tmpl", "source_encoding": "utf-8", "line_map": {"64": 25, "33": 2, "34": 7, "35": 7, "36": 11, "37": 11, "70": 64, "60": 24, "43": 31, "63": 25, "15": 0, "59": 24, "20": 21, "21": 28, "22": 33, "58": 23, "47": 31, "28": 2, "61": 25, "62": 25, "53": 23}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_livefyre.tmpl"}
+{"line_map": {"64": 11, "33": 23, "34": 24, "35": 24, "36": 25, "37": 25, "38": 25, "39": 25, "60": 2, "70": 64, "45": 31, "15": 0, "49": 31, "20": 21, "21": 28, "22": 33, "55": 2, "28": 23, "61": 7, "62": 7, "63": 11}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_livefyre.tmpl", "uri": "comments_helper_livefyre.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/comments_helper_muut.tmpl.py b/cache/.mako.tmp/comments_helper_muut.tmpl.py
index 5af28d37..32bb329a 100644
--- a/cache/.mako.tmp/comments_helper_muut.tmpl.py
+++ b/cache/.mako.tmp/comments_helper_muut.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.2143605
+_modified_time = 1434160807.4043133
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_muut.tmpl'
 _template_uri = 'comments_helper_muut.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['comment_form', 'comment_link_script', 'comment_link']
+_exports = ['comment_link', 'comment_link_script', 'comment_form']
 
 
 def render_body(context,**pageargs):
@@ -26,6 +26,26 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_comment_link(context,link,identifier):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_comment_link_script(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n<script src="//cdn.muut.com/1/moot.min.js"></script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_comment_form(context,url,title,identifier):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -43,28 +63,8 @@ def render_comment_form(context,url,title,identifier):
         context.caller_stack._pop_frame()
 
 
-def render_comment_link_script(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n<script src="//cdn.muut.com/1/moot.min.js"></script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_comment_link(context,link,identifier):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        __M_writer = context.writer()
-        __M_writer('\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 """
 __M_BEGIN_METADATA
-{"uri": "comments_helper_muut.tmpl", "source_encoding": "utf-8", "line_map": {"34": 3, "35": 4, "36": 4, "37": 4, "38": 4, "39": 4, "40": 4, "66": 60, "46": 11, "15": 0, "50": 11, "20": 2, "21": 5, "22": 8, "23": 13, "56": 7, "60": 7, "29": 3}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_muut.tmpl"}
+{"line_map": {"33": 7, "66": 60, "54": 3, "39": 11, "57": 4, "43": 11, "15": 0, "49": 3, "20": 2, "21": 5, "22": 8, "23": 13, "56": 4, "55": 4, "58": 4, "59": 4, "60": 4, "29": 7}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/comments_helper_muut.tmpl", "uri": "comments_helper_muut.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/crumbs.tmpl.py b/cache/.mako.tmp/crumbs.tmpl.py
index f956b18d..0a671aa1 100644
--- a/cache/.mako.tmp/crumbs.tmpl.py
+++ b/cache/.mako.tmp/crumbs.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.3592775
+_modified_time = 1434160807.5501149
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/crumbs.tmpl'
 _template_uri = 'crumbs.tmpl'
@@ -52,6 +52,6 @@ def render_bar(context,crumbs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "crumbs.tmpl", "source_encoding": "utf-8", "line_map": {"32": 3, "33": 4, "34": 5, "35": 7, "36": 8, "37": 9, "38": 10, "39": 10, "40": 10, "41": 11, "42": 12, "43": 12, "44": 12, "45": 12, "46": 12, "15": 0, "47": 16, "20": 2, "21": 19, "27": 3, "53": 47}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/crumbs.tmpl"}
+{"line_map": {"32": 3, "33": 4, "34": 5, "35": 7, "36": 8, "37": 9, "38": 10, "39": 10, "40": 10, "41": 11, "42": 12, "43": 12, "44": 12, "45": 12, "46": 12, "15": 0, "47": 16, "20": 2, "21": 19, "27": 3, "53": 47}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/crumbs.tmpl", "uri": "crumbs.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/index.tmpl.py b/cache/.mako.tmp/index.tmpl.py
index e140725f..06a917cf 100644
--- a/cache/.mako.tmp/index.tmpl.py
+++ b/cache/.mako.tmp/index.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.1278067
+_modified_time = 1434160807.3169587
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index.tmpl'
 _template_uri = 'index.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['extra_head', 'content_header', 'content']
+_exports = ['content_header', 'extra_head', 'content']
 
 
 def _mako_get_namespace(context, name):
@@ -32,20 +32,20 @@ def render_body(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
-        permalink = context.get('permalink', UNDEFINED)
-        helper = _mako_get_namespace(context, 'helper')
-        index_file = context.get('index_file', UNDEFINED)
-        parent = context.get('parent', UNDEFINED)
-        posts = context.get('posts', UNDEFINED)
-        comments = _mako_get_namespace(context, 'comments')
         def content_header():
             return render_content_header(context._locals(__M_locals))
-        def extra_head():
-            return render_extra_head(context._locals(__M_locals))
-        date_format = context.get('date_format', UNDEFINED)
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        helper = _mako_get_namespace(context, 'helper')
+        comments = _mako_get_namespace(context, 'comments')
         def content():
             return render_content(context._locals(__M_locals))
+        date_format = context.get('date_format', UNDEFINED)
+        posts = context.get('posts', UNDEFINED)
+        permalink = context.get('permalink', UNDEFINED)
+        index_file = context.get('index_file', UNDEFINED)
+        parent = context.get('parent', UNDEFINED)
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        def extra_head():
+            return render_extra_head(context._locals(__M_locals))
         index_teasers = context.get('index_teasers', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
@@ -66,15 +66,26 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_content_header(context,**pageargs):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        def content_header():
+            return render_content_header(context)
+        __M_writer = context.writer()
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_extra_head(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         def extra_head():
             return render_extra_head(context)
-        index_file = context.get('index_file', UNDEFINED)
         posts = context.get('posts', UNDEFINED)
-        parent = context.get('parent', UNDEFINED)
         permalink = context.get('permalink', UNDEFINED)
+        parent = context.get('parent', UNDEFINED)
+        index_file = context.get('index_file', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n    ')
         __M_writer(str(parent.extra_head()))
@@ -88,29 +99,18 @@ def render_extra_head(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_content_header(context,**pageargs):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        def content_header():
-            return render_content_header(context)
-        __M_writer = context.writer()
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
-        helper = _mako_get_namespace(context, 'helper')
-        posts = context.get('posts', UNDEFINED)
-        comments = _mako_get_namespace(context, 'comments')
         def content_header():
             return render_content_header(context)
-        date_format = context.get('date_format', UNDEFINED)
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        helper = _mako_get_namespace(context, 'helper')
+        comments = _mako_get_namespace(context, 'comments')
         def content():
             return render_content(context)
+        date_format = context.get('date_format', UNDEFINED)
+        posts = context.get('posts', UNDEFINED)
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
         index_teasers = context.get('index_teasers', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
@@ -165,6 +165,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "index.tmpl", "source_encoding": "utf-8", "line_map": {"128": 19, "129": 19, "130": 21, "131": 21, "132": 22, "133": 22, "134": 22, "135": 22, "136": 22, "137": 22, "138": 22, "139": 22, "140": 23, "141": 24, "142": 24, "143": 24, "144": 26, "145": 28, "146": 29, "147": 30, "148": 30, "149": 31, "22": 2, "151": 33, "152": 33, "25": 3, "154": 38, "155": 39, "156": 39, "157": 40, "150": 32, "31": 0, "160": 41, "166": 160, "51": 2, "52": 3, "53": 4, "58": 11, "159": 41, "63": 42, "69": 6, "158": 40, "79": 6, "80": 7, "81": 7, "82": 8, "83": 9, "84": 9, "85": 9, "91": 14, "102": 13, "116": 13, "153": 35, "121": 14, "122": 16, "123": 17, "124": 17, "125": 17, "126": 19, "127": 19}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index.tmpl"}
+{"line_map": {"128": 19, "129": 19, "130": 21, "131": 21, "132": 22, "133": 22, "134": 22, "135": 22, "136": 22, "137": 22, "138": 22, "139": 22, "140": 23, "141": 24, "142": 24, "143": 24, "144": 26, "145": 28, "146": 29, "147": 30, "148": 30, "149": 31, "22": 2, "151": 33, "152": 33, "25": 3, "154": 38, "155": 39, "156": 39, "157": 40, "150": 32, "31": 0, "160": 41, "166": 160, "51": 2, "52": 3, "53": 4, "58": 11, "159": 41, "63": 42, "69": 14, "158": 40, "80": 6, "90": 6, "91": 7, "92": 7, "93": 8, "94": 9, "95": 9, "96": 9, "102": 13, "116": 13, "153": 35, "121": 14, "122": 16, "123": 17, "124": 17, "125": 17, "126": 19, "127": 19}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index.tmpl", "uri": "index.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/index_helper.tmpl.py b/cache/.mako.tmp/index_helper.tmpl.py
index a9ba44b2..2d773c16 100644
--- a/cache/.mako.tmp/index_helper.tmpl.py
+++ b/cache/.mako.tmp/index_helper.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.1463242
+_modified_time = 1434160807.3354769
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index_helper.tmpl'
 _template_uri = 'index_helper.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['html_pager', 'mathjax_script']
+_exports = ['mathjax_script', 'html_pager']
 
 
 def render_body(context,**pageargs):
@@ -24,6 +24,19 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_mathjax_script(context,posts):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        any = context.get('any', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if any(post.is_mathjax for post in posts):
+            __M_writer('        <script type="text/x-mathjax-config">\n        MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$latex \',\'$\'], [\'\\\\(\',\'\\\\)\']]}});</script>\n        <script src="/assets/js/mathjax.js"></script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_html_pager(context):
     __M_caller = context.caller_stack._push_frame()
     try:
@@ -52,21 +65,8 @@ def render_html_pager(context):
         context.caller_stack._pop_frame()
 
 
-def render_mathjax_script(context,posts):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        any = context.get('any', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if any(post.is_mathjax for post in posts):
-            __M_writer('        <script type="text/x-mathjax-config">\n        MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$latex \',\'$\'], [\'\\\\(\',\'\\\\)\']]}});</script>\n        <script src="/assets/js/mathjax.js"></script>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 """
 __M_BEGIN_METADATA
-{"uri": "index_helper.tmpl", "source_encoding": "utf-8", "line_map": {"68": 62, "15": 0, "20": 19, "21": 27, "27": 2, "34": 2, "35": 3, "36": 4, "37": 6, "38": 7, "39": 8, "40": 8, "41": 8, "42": 8, "43": 11, "44": 12, "45": 13, "46": 13, "47": 13, "48": 13, "49": 16, "55": 21, "60": 21, "61": 22, "62": 23}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index_helper.tmpl"}
+{"line_map": {"68": 62, "15": 0, "20": 19, "21": 27, "27": 21, "32": 21, "33": 22, "34": 23, "40": 2, "47": 2, "48": 3, "49": 4, "50": 6, "51": 7, "52": 8, "53": 8, "54": 8, "55": 8, "56": 11, "57": 12, "58": 13, "59": 13, "60": 13, "61": 13, "62": 16}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/index_helper.tmpl", "uri": "index_helper.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/list.tmpl.py b/cache/.mako.tmp/list.tmpl.py
index 6cc1e653..b2235e5f 100644
--- a/cache/.mako.tmp/list.tmpl.py
+++ b/cache/.mako.tmp/list.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.3809576
+_modified_time = 1434160807.5715864
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list.tmpl'
 _template_uri = 'list.tmpl'
@@ -28,9 +28,9 @@ def render_body(context,**pageargs):
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         items = context.get('items', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n\n')
@@ -48,9 +48,9 @@ def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         items = context.get('items', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context)
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<article class="listpage">\n    <header>\n        <h1>')
@@ -77,6 +77,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "list.tmpl", "source_encoding": "utf-8", "line_map": {"64": 12, "65": 12, "66": 12, "67": 14, "68": 15, "69": 16, "70": 16, "71": 16, "72": 18, "78": 72, "26": 0, "36": 2, "41": 19, "47": 4, "56": 4, "57": 7, "58": 7, "59": 9, "60": 10, "61": 11, "62": 12, "63": 12}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list.tmpl"}
+{"line_map": {"64": 12, "65": 12, "66": 12, "67": 14, "68": 15, "69": 16, "70": 16, "71": 16, "72": 18, "78": 72, "26": 0, "36": 2, "41": 19, "47": 4, "56": 4, "57": 7, "58": 7, "59": 9, "60": 10, "61": 11, "62": 12, "63": 12}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list.tmpl", "uri": "list.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/list_post.tmpl.py b/cache/.mako.tmp/list_post.tmpl.py
index f6921448..04afc741 100644
--- a/cache/.mako.tmp/list_post.tmpl.py
+++ b/cache/.mako.tmp/list_post.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.3942926
+_modified_time = 1434160807.5853806
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list_post.tmpl'
 _template_uri = 'list_post.tmpl'
@@ -28,10 +28,10 @@ def render_body(context,**pageargs):
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         date_format = context.get('date_format', UNDEFINED)
-        posts = context.get('posts', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
+        posts = context.get('posts', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n\n')
@@ -49,10 +49,10 @@ def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         date_format = context.get('date_format', UNDEFINED)
-        posts = context.get('posts', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context)
+        posts = context.get('posts', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<article class="listpage">\n    <header>\n        <h1>')
@@ -85,6 +85,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "list_post.tmpl", "source_encoding": "utf-8", "line_map": {"64": 12, "65": 12, "66": 12, "67": 12, "68": 12, "69": 12, "70": 12, "71": 12, "72": 12, "73": 12, "74": 12, "75": 14, "76": 15, "77": 16, "78": 16, "79": 16, "80": 18, "86": 80, "26": 0, "37": 2, "42": 19, "48": 4, "58": 4, "59": 7, "60": 7, "61": 9, "62": 10, "63": 11}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list_post.tmpl"}
+{"line_map": {"64": 12, "65": 12, "66": 12, "67": 12, "68": 12, "69": 12, "70": 12, "71": 12, "72": 12, "73": 12, "74": 12, "75": 14, "76": 15, "77": 16, "78": 16, "79": 16, "80": 18, "86": 80, "26": 0, "37": 2, "42": 19, "48": 4, "58": 4, "59": 7, "60": 7, "61": 9, "62": 10, "63": 11}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/list_post.tmpl", "uri": "list_post.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/listing.tmpl.py b/cache/.mako.tmp/listing.tmpl.py
index d4f63d9e..61bc75af 100644
--- a/cache/.mako.tmp/listing.tmpl.py
+++ b/cache/.mako.tmp/listing.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.3479712
+_modified_time = 1434160807.5387342
 _enable_loop = True
 _template_filename = 'themes/bootstrap3/templates/listing.tmpl'
 _template_uri = 'listing.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['sourcelink', 'content']
+_exports = ['content', 'sourcelink']
 
 
 def _mako_get_namespace(context, name):
@@ -31,17 +31,17 @@ def render_body(context,**pageargs):
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         _import_ns = {}
         _mako_get_namespace(context, 'ui')._populate(_import_ns, ['bar'])
-        crumbs = _import_ns.get('crumbs', context.get('crumbs', UNDEFINED))
-        def sourcelink():
-            return render_sourcelink(context._locals(__M_locals))
-        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
         files = _import_ns.get('files', context.get('files', UNDEFINED))
-        source_link = _import_ns.get('source_link', context.get('source_link', UNDEFINED))
         code = _import_ns.get('code', context.get('code', UNDEFINED))
         def content():
             return render_content(context._locals(__M_locals))
-        ui = _mako_get_namespace(context, 'ui')
+        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
+        source_link = _import_ns.get('source_link', context.get('source_link', UNDEFINED))
+        crumbs = _import_ns.get('crumbs', context.get('crumbs', UNDEFINED))
         folders = _import_ns.get('folders', context.get('folders', UNDEFINED))
+        def sourcelink():
+            return render_sourcelink(context._locals(__M_locals))
+        ui = _mako_get_namespace(context, 'ui')
         __M_writer = context.writer()
         __M_writer('\n')
         __M_writer('\n\n')
@@ -60,40 +60,18 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
-def render_sourcelink(context,**pageargs):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        _import_ns = {}
-        _mako_get_namespace(context, 'ui')._populate(_import_ns, ['bar'])
-        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
-        def sourcelink():
-            return render_sourcelink(context)
-        source_link = _import_ns.get('source_link', context.get('source_link', UNDEFINED))
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if source_link:
-            __M_writer('    <li>\n    <a href="')
-            __M_writer(str(source_link))
-            __M_writer('" id="sourcelink">')
-            __M_writer(str(messages("Source")))
-            __M_writer('</a>\n    </li>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         _import_ns = {}
         _mako_get_namespace(context, 'ui')._populate(_import_ns, ['bar'])
-        crumbs = _import_ns.get('crumbs', context.get('crumbs', UNDEFINED))
-        files = _import_ns.get('files', context.get('files', UNDEFINED))
         code = _import_ns.get('code', context.get('code', UNDEFINED))
         def content():
             return render_content(context)
-        ui = _mako_get_namespace(context, 'ui')
+        crumbs = _import_ns.get('crumbs', context.get('crumbs', UNDEFINED))
         folders = _import_ns.get('folders', context.get('folders', UNDEFINED))
+        ui = _mako_get_namespace(context, 'ui')
+        files = _import_ns.get('files', context.get('files', UNDEFINED))
         __M_writer = context.writer()
         __M_writer('\n')
         __M_writer(str(ui.bar(crumbs)))
@@ -122,8 +100,30 @@ def render_content(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_sourcelink(context,**pageargs):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        _import_ns = {}
+        _mako_get_namespace(context, 'ui')._populate(_import_ns, ['bar'])
+        source_link = _import_ns.get('source_link', context.get('source_link', UNDEFINED))
+        messages = _import_ns.get('messages', context.get('messages', UNDEFINED))
+        def sourcelink():
+            return render_sourcelink(context)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if source_link:
+            __M_writer('    <li>\n    <a href="')
+            __M_writer(str(source_link))
+            __M_writer('" id="sourcelink">')
+            __M_writer(str(messages("Source")))
+            __M_writer('</a>\n    </li>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "listing.tmpl", "source_encoding": "utf-8", "line_map": {"73": 22, "74": 23, "75": 24, "76": 25, "77": 25, "78": 25, "79": 25, "85": 5, "22": 3, "110": 13, "111": 13, "28": 0, "116": 17, "98": 5, "99": 6, "100": 6, "101": 7, "102": 8, "103": 9, "104": 10, "105": 10, "106": 10, "107": 10, "108": 10, "109": 12, "46": 2, "47": 3, "112": 13, "113": 13, "114": 13, "115": 15, "52": 20, "117": 18, "118": 18, "119": 18, "57": 28, "125": 119, "63": 22}, "filename": "themes/bootstrap3/templates/listing.tmpl"}
+{"line_map": {"22": 3, "76": 5, "77": 6, "78": 6, "79": 7, "80": 8, "81": 9, "82": 10, "83": 10, "84": 10, "85": 10, "86": 10, "87": 12, "88": 13, "89": 13, "90": 13, "91": 13, "28": 0, "93": 15, "94": 17, "95": 18, "96": 18, "97": 18, "116": 25, "103": 22, "92": 13, "46": 2, "47": 3, "113": 22, "114": 23, "115": 24, "52": 20, "117": 25, "118": 25, "119": 25, "57": 28, "125": 119, "63": 5}, "source_encoding": "utf-8", "filename": "themes/bootstrap3/templates/listing.tmpl", "uri": "listing.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/post.tmpl.py b/cache/.mako.tmp/post.tmpl.py
index e1aadd1d..6cfc313f 100644
--- a/cache/.mako.tmp/post.tmpl.py
+++ b/cache/.mako.tmp/post.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.4218714
+_modified_time = 1434160807.6130695
 _enable_loop = True
 _template_filename = 'themes/bootstrap/templates/post.tmpl'
 _template_uri = 'post.tmpl'
@@ -35,20 +35,20 @@ def render_body(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
-        def sourcelink():
-            return render_sourcelink(context._locals(__M_locals))
         helper = _mako_get_namespace(context, 'helper')
-        parent = context.get('parent', UNDEFINED)
-        post = context.get('post', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         comments = _mako_get_namespace(context, 'comments')
-        def extra_head():
-            return render_extra_head(context._locals(__M_locals))
-        pheader = _mako_get_namespace(context, 'pheader')
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
+        messages = context.get('messages', UNDEFINED)
+        pheader = _mako_get_namespace(context, 'pheader')
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        parent = context.get('parent', UNDEFINED)
+        def extra_head():
+            return render_extra_head(context._locals(__M_locals))
         show_sourcelink = context.get('show_sourcelink', UNDEFINED)
+        post = context.get('post', UNDEFINED)
+        def sourcelink():
+            return render_sourcelink(context._locals(__M_locals))
         __M_writer = context.writer()
         __M_writer('\n')
         __M_writer('\n')
@@ -124,11 +124,11 @@ def render_extra_head(context,**pageargs):
 def render_sourcelink(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
+        messages = context.get('messages', UNDEFINED)
         show_sourcelink = context.get('show_sourcelink', UNDEFINED)
         def sourcelink():
             return render_sourcelink(context)
         post = context.get('post', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         if show_sourcelink:
@@ -145,14 +145,14 @@ def render_sourcelink(context,**pageargs):
 def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
-        comments = _mako_get_namespace(context, 'comments')
-        helper = _mako_get_namespace(context, 'helper')
-        pheader = _mako_get_namespace(context, 'pheader')
-        messages = context.get('messages', UNDEFINED)
-        post = context.get('post', UNDEFINED)
         site_has_comments = context.get('site_has_comments', UNDEFINED)
+        helper = _mako_get_namespace(context, 'helper')
+        comments = _mako_get_namespace(context, 'comments')
         def content():
             return render_content(context)
+        messages = context.get('messages', UNDEFINED)
+        pheader = _mako_get_namespace(context, 'pheader')
+        post = context.get('post', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<article class="post-')
         __M_writer(str(post.meta('type')))
@@ -183,6 +183,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "post.tmpl", "source_encoding": "utf-8", "line_map": {"133": 50, "134": 51, "135": 52, "136": 53, "137": 53, "138": 53, "139": 53, "145": 27, "22": 2, "25": 3, "28": 4, "157": 27, "158": 28, "159": 28, "160": 29, "161": 29, "34": 0, "163": 31, "162": 31, "165": 35, "166": 36, "167": 36, "168": 39, "169": 40, "170": 41, "171": 41, "172": 42, "173": 42, "174": 45, "175": 45, "176": 45, "177": 47, "178": 47, "53": 2, "54": 3, "55": 4, "56": 5, "61": 25, "66": 48, "164": 35, "71": 56, "77": 7, "184": 178, "86": 7, "87": 8, "88": 8, "89": 9, "90": 10, "91": 10, "92": 10, "93": 12, "94": 13, "95": 13, "96": 13, "97": 15, "98": 15, "99": 15, "100": 16, "101": 17, "102": 17, "103": 17, "104": 17, "105": 17, "106": 19, "107": 20, "108": 20, "109": 20, "110": 20, "111": 20, "112": 22, "113": 22, "114": 22, "115": 23, "116": 23, "117": 24, "118": 24, "124": 50}, "filename": "themes/bootstrap/templates/post.tmpl"}
+{"line_map": {"133": 50, "134": 51, "135": 52, "136": 53, "137": 53, "138": 53, "139": 53, "145": 27, "22": 2, "25": 3, "28": 4, "157": 27, "158": 28, "159": 28, "160": 29, "161": 29, "34": 0, "163": 31, "162": 31, "165": 35, "166": 36, "167": 36, "168": 39, "169": 40, "170": 41, "171": 41, "172": 42, "173": 42, "174": 45, "175": 45, "176": 45, "177": 47, "178": 47, "53": 2, "54": 3, "55": 4, "56": 5, "61": 25, "66": 48, "164": 35, "71": 56, "77": 7, "184": 178, "86": 7, "87": 8, "88": 8, "89": 9, "90": 10, "91": 10, "92": 10, "93": 12, "94": 13, "95": 13, "96": 13, "97": 15, "98": 15, "99": 15, "100": 16, "101": 17, "102": 17, "103": 17, "104": 17, "105": 17, "106": 19, "107": 20, "108": 20, "109": 20, "110": 20, "111": 20, "112": 22, "113": 22, "114": 22, "115": 23, "116": 23, "117": 24, "118": 24, "124": 50}, "source_encoding": "utf-8", "filename": "themes/bootstrap/templates/post.tmpl", "uri": "post.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/post_header.tmpl.py b/cache/.mako.tmp/post_header.tmpl.py
index 307f4ad8..e19a119a 100644
--- a/cache/.mako.tmp/post_header.tmpl.py
+++ b/cache/.mako.tmp/post_header.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.4862483
+_modified_time = 1434160807.6778095
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_header.tmpl'
 _template_uri = 'post_header.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['html_post_header', 'html_title', 'html_translations', 'html_sourcelink']
+_exports = ['html_title', 'html_post_header', 'html_translations', 'html_sourcelink']
 
 
 def _mako_get_namespace(context, name):
@@ -41,20 +41,38 @@ def render_body(context,**pageargs):
         context.caller_stack._pop_frame()
 
 
+def render_html_title(context):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        post = context.get('post', UNDEFINED)
+        title = context.get('title', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if title and not post.meta('hidetitle'):
+            __M_writer('    <h1 class="p-name entry-title" itemprop="headline name"><a href="')
+            __M_writer(str(post.permalink()))
+            __M_writer('" class="u-url">')
+            __M_writer(filters.html_escape(str(post.title())))
+            __M_writer('</a></h1>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 def render_html_post_header(context):
     __M_caller = context.caller_stack._push_frame()
     try:
         def html_title():
             return render_html_title(context)
-        messages = context.get('messages', UNDEFINED)
-        post = context.get('post', UNDEFINED)
         def html_translations(post):
             return render_html_translations(context,post)
         comments = _mako_get_namespace(context, 'comments')
-        date_format = context.get('date_format', UNDEFINED)
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
         def html_sourcelink():
             return render_html_sourcelink(context)
+        date_format = context.get('date_format', UNDEFINED)
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        post = context.get('post', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n    <header>\n        ')
         __M_writer(str(html_title()))
@@ -94,31 +112,13 @@ def render_html_post_header(context):
         context.caller_stack._pop_frame()
 
 
-def render_html_title(context):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        post = context.get('post', UNDEFINED)
-        title = context.get('title', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if title and not post.meta('hidetitle'):
-            __M_writer('    <h1 class="p-name entry-title" itemprop="headline name"><a href="')
-            __M_writer(str(post.permalink()))
-            __M_writer('" class="u-url">')
-            __M_writer(filters.html_escape(str(post.title())))
-            __M_writer('</a></h1>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_html_translations(context,post):
     __M_caller = context.caller_stack._push_frame()
     try:
         len = context.get('len', UNDEFINED)
-        lang = context.get('lang', UNDEFINED)
         messages = context.get('messages', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         if len(post.translated_to) > 1:
@@ -143,9 +143,9 @@ def render_html_translations(context,post):
 def render_html_sourcelink(context):
     __M_caller = context.caller_stack._push_frame()
     try:
+        messages = context.get('messages', UNDEFINED)
         show_sourcelink = context.get('show_sourcelink', UNDEFINED)
         post = context.get('post', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         if show_sourcelink:
@@ -161,6 +161,6 @@ def render_html_sourcelink(context):
 
 """
 __M_BEGIN_METADATA
-{"uri": "post_header.tmpl", "source_encoding": "utf-8", "line_map": {"128": 15, "129": 16, "130": 17, "131": 17, "132": 17, "133": 17, "134": 17, "135": 17, "136": 17, "137": 20, "143": 24, "22": 2, "151": 25, "152": 26, "25": 3, "154": 26, "155": 26, "28": 0, "150": 24, "33": 2, "34": 3, "35": 9, "36": 22, "37": 28, "38": 49, "156": 26, "44": 30, "162": 156, "59": 30, "60": 32, "61": 32, "62": 34, "63": 34, "64": 35, "65": 35, "66": 35, "67": 35, "68": 35, "69": 35, "70": 35, "71": 35, "72": 36, "73": 37, "74": 37, "75": 37, "76": 39, "77": 39, "78": 39, "79": 40, "80": 41, "81": 41, "82": 41, "83": 41, "84": 41, "85": 43, "86": 44, "87": 44, "88": 44, "89": 46, "90": 47, "91": 47, "97": 5, "103": 5, "104": 6, "105": 7, "106": 7, "107": 7, "108": 7, "109": 7, "115": 11, "153": 26, "123": 11, "124": 12, "125": 13, "126": 14, "127": 14}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_header.tmpl"}
+{"line_map": {"128": 15, "129": 16, "130": 17, "131": 17, "132": 17, "133": 17, "134": 17, "135": 17, "136": 17, "137": 20, "162": 156, "143": 24, "22": 2, "151": 25, "152": 26, "25": 3, "154": 26, "155": 26, "28": 0, "150": 24, "33": 2, "34": 3, "35": 9, "36": 22, "37": 28, "38": 49, "156": 26, "44": 5, "50": 5, "51": 6, "52": 7, "53": 7, "54": 7, "55": 7, "56": 7, "62": 30, "77": 30, "78": 32, "79": 32, "80": 34, "81": 34, "82": 35, "83": 35, "84": 35, "85": 35, "86": 35, "87": 35, "88": 35, "89": 35, "90": 36, "91": 37, "92": 37, "93": 37, "94": 39, "95": 39, "96": 39, "97": 40, "98": 41, "99": 41, "100": 41, "101": 41, "102": 41, "103": 43, "104": 44, "105": 44, "106": 44, "107": 46, "108": 47, "109": 47, "115": 11, "153": 26, "123": 11, "124": 12, "125": 13, "126": 14, "127": 14}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_header.tmpl", "uri": "post_header.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/post_helper.tmpl.py b/cache/.mako.tmp/post_helper.tmpl.py
index c92e1904..b6332921 100644
--- a/cache/.mako.tmp/post_helper.tmpl.py
+++ b/cache/.mako.tmp/post_helper.tmpl.py
@@ -4,12 +4,12 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.4533014
+_modified_time = 1434160807.6446033
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_helper.tmpl'
 _template_uri = 'post_helper.tmpl'
 _source_encoding = 'utf-8'
-_exports = ['meta_translations', 'html_pager', 'html_tags', 'open_graph_metadata', 'mathjax_script', 'twitter_card_information']
+_exports = ['meta_translations', 'open_graph_metadata', 'html_tags', 'twitter_card_information', 'mathjax_script', 'html_pager']
 
 
 def render_body(context,**pageargs):
@@ -33,8 +33,8 @@ def render_meta_translations(context,post):
     __M_caller = context.caller_stack._push_frame()
     try:
         len = context.get('len', UNDEFINED)
-        lang = context.get('lang', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         if len(translations) > 1:
@@ -50,67 +50,15 @@ def render_meta_translations(context,post):
         context.caller_stack._pop_frame()
 
 
-def render_html_pager(context,post):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        messages = context.get('messages', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if post.prev_post or post.next_post:
-            __M_writer('        <ul class="pager">\n')
-            if post.prev_post:
-                __M_writer('            <li class="previous">\n                <a href="')
-                __M_writer(str(post.prev_post.permalink()))
-                __M_writer('" rel="prev" title="')
-                __M_writer(filters.html_escape(str(post.prev_post.title())))
-                __M_writer('">')
-                __M_writer(str(messages("Previous post")))
-                __M_writer('</a>\n            </li>\n')
-            if post.next_post:
-                __M_writer('            <li class="next">\n                <a href="')
-                __M_writer(str(post.next_post.permalink()))
-                __M_writer('" rel="next" title="')
-                __M_writer(filters.html_escape(str(post.next_post.title())))
-                __M_writer('">')
-                __M_writer(str(messages("Next post")))
-                __M_writer('</a>\n            </li>\n')
-            __M_writer('        </ul>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
-def render_html_tags(context,post):
-    __M_caller = context.caller_stack._push_frame()
-    try:
-        _link = context.get('_link', UNDEFINED)
-        hidden_tags = context.get('hidden_tags', UNDEFINED)
-        __M_writer = context.writer()
-        __M_writer('\n')
-        if post.tags:
-            __M_writer('        <ul itemprop="keywords" class="tags">\n')
-            for tag in post.tags:
-                if tag not in hidden_tags:
-                    __M_writer('            <li><a class="tag p-category" href="')
-                    __M_writer(str(_link('tag', tag)))
-                    __M_writer('" rel="tag">')
-                    __M_writer(str(tag))
-                    __M_writer('</a></li>\n')
-            __M_writer('        </ul>\n')
-        return ''
-    finally:
-        context.caller_stack._pop_frame()
-
-
 def render_open_graph_metadata(context,post):
     __M_caller = context.caller_stack._push_frame()
     try:
-        use_open_graph = context.get('use_open_graph', UNDEFINED)
+        blog_title = context.get('blog_title', UNDEFINED)
+        lang = context.get('lang', UNDEFINED)
         permalink = context.get('permalink', UNDEFINED)
         striphtml = context.get('striphtml', UNDEFINED)
-        lang = context.get('lang', UNDEFINED)
+        use_open_graph = context.get('use_open_graph', UNDEFINED)
         url_replacer = context.get('url_replacer', UNDEFINED)
-        blog_title = context.get('blog_title', UNDEFINED)
         abs_link = context.get('abs_link', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
@@ -149,13 +97,23 @@ def render_open_graph_metadata(context,post):
         context.caller_stack._pop_frame()
 
 
-def render_mathjax_script(context,post):
+def render_html_tags(context,post):
     __M_caller = context.caller_stack._push_frame()
     try:
+        _link = context.get('_link', UNDEFINED)
+        hidden_tags = context.get('hidden_tags', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
-        if post.is_mathjax:
-            __M_writer('        <script type="text/x-mathjax-config">\n        MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$latex \',\'$\'], [\'\\\\(\',\'\\\\)\']]}});</script>\n        <script src="/assets/js/mathjax.js"></script>\n')
+        if post.tags:
+            __M_writer('        <ul itemprop="keywords" class="tags">\n')
+            for tag in post.tags:
+                if tag not in hidden_tags:
+                    __M_writer('            <li><a class="tag p-category" href="')
+                    __M_writer(str(_link('tag', tag)))
+                    __M_writer('" rel="tag">')
+                    __M_writer(str(tag))
+                    __M_writer('</a></li>\n')
+            __M_writer('        </ul>\n')
         return ''
     finally:
         context.caller_stack._pop_frame()
@@ -192,8 +150,50 @@ def render_twitter_card_information(context,post):
         context.caller_stack._pop_frame()
 
 
+def render_mathjax_script(context,post):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if post.is_mathjax:
+            __M_writer('        <script type="text/x-mathjax-config">\n        MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$latex \',\'$\'], [\'\\\\(\',\'\\\\)\']]}});</script>\n        <script src="/assets/js/mathjax.js"></script>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+def render_html_pager(context,post):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        messages = context.get('messages', UNDEFINED)
+        __M_writer = context.writer()
+        __M_writer('\n')
+        if post.prev_post or post.next_post:
+            __M_writer('        <ul class="pager">\n')
+            if post.prev_post:
+                __M_writer('            <li class="previous">\n                <a href="')
+                __M_writer(str(post.prev_post.permalink()))
+                __M_writer('" rel="prev" title="')
+                __M_writer(filters.html_escape(str(post.prev_post.title())))
+                __M_writer('">')
+                __M_writer(str(messages("Previous post")))
+                __M_writer('</a>\n            </li>\n')
+            if post.next_post:
+                __M_writer('            <li class="next">\n                <a href="')
+                __M_writer(str(post.next_post.permalink()))
+                __M_writer('" rel="next" title="')
+                __M_writer(filters.html_escape(str(post.next_post.title())))
+                __M_writer('">')
+                __M_writer(str(messages("Next post")))
+                __M_writer('</a>\n            </li>\n')
+            __M_writer('        </ul>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
 """
 __M_BEGIN_METADATA
-{"uri": "post_helper.tmpl", "source_encoding": "utf-8", "line_map": {"15": 0, "20": 2, "21": 11, "22": 23, "23": 40, "24": 69, "25": 85, "26": 93, "32": 3, "39": 3, "40": 4, "41": 5, "42": 6, "43": 7, "44": 7, "45": 7, "46": 7, "47": 7, "53": 25, "58": 25, "59": 26, "60": 27, "61": 28, "62": 29, "63": 30, "64": 30, "65": 30, "66": 30, "67": 30, "68": 30, "69": 33, "70": 34, "71": 35, "72": 35, "73": 35, "74": 35, "75": 35, "76": 35, "77": 38, "83": 13, "89": 13, "90": 14, "91": 15, "92": 16, "93": 17, "94": 18, "95": 18, "96": 18, "97": 18, "98": 18, "99": 21, "105": 42, "116": 42, "117": 43, "118": 44, "119": 44, "120": 44, "121": 45, "122": 45, "123": 46, "124": 46, "125": 47, "126": 48, "127": 48, "128": 48, "129": 49, "130": 50, "131": 50, "132": 50, "133": 52, "134": 53, "135": 53, "136": 53, "137": 55, "138": 60, "139": 61, "140": 61, "141": 61, "142": 63, "143": 64, "144": 65, "145": 65, "146": 65, "152": 87, "156": 87, "157": 88, "158": 89, "164": 71, "169": 71, "170": 72, "171": 73, "172": 73, "173": 73, "174": 74, "175": 75, "176": 75, "177": 75, "178": 76, "179": 77, "180": 77, "181": 77, "182": 79, "183": 80, "184": 80, "185": 80, "186": 81, "187": 82, "188": 82, "189": 82, "195": 189}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_helper.tmpl"}
+{"line_map": {"15": 0, "20": 2, "21": 11, "22": 23, "23": 40, "24": 69, "25": 85, "26": 93, "32": 3, "39": 3, "40": 4, "41": 5, "42": 6, "43": 7, "44": 7, "45": 7, "46": 7, "47": 7, "53": 42, "64": 42, "65": 43, "66": 44, "67": 44, "68": 44, "69": 45, "70": 45, "71": 46, "72": 46, "73": 47, "74": 48, "75": 48, "76": 48, "77": 49, "78": 50, "79": 50, "80": 50, "81": 52, "82": 53, "83": 53, "84": 53, "85": 55, "86": 60, "87": 61, "88": 61, "89": 61, "90": 63, "91": 64, "92": 65, "93": 65, "94": 65, "100": 13, "106": 13, "107": 14, "108": 15, "109": 16, "110": 17, "111": 18, "112": 18, "113": 18, "114": 18, "115": 18, "116": 21, "122": 71, "127": 71, "128": 72, "129": 73, "130": 73, "131": 73, "132": 74, "133": 75, "134": 75, "135": 75, "136": 76, "137": 77, "138": 77, "139": 77, "140": 79, "141": 80, "142": 80, "143": 80, "144": 81, "145": 82, "146": 82, "147": 82, "153": 87, "157": 87, "158": 88, "159": 89, "165": 25, "170": 25, "171": 26, "172": 27, "173": 28, "174": 29, "175": 30, "176": 30, "177": 30, "178": 30, "179": 30, "180": 30, "181": 33, "182": 34, "183": 35, "184": 35, "185": 35, "186": 35, "187": 35, "188": 35, "189": 38, "195": 189}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/post_helper.tmpl", "uri": "post_helper.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/story.tmpl.py b/cache/.mako.tmp/story.tmpl.py
index a6732a87..c6de71f3 100644
--- a/cache/.mako.tmp/story.tmpl.py
+++ b/cache/.mako.tmp/story.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.5097966
+_modified_time = 1434160807.7016406
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/story.tmpl'
 _template_uri = 'story.tmpl'
@@ -35,15 +35,15 @@ def render_body(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
-        enable_comments = context.get('enable_comments', UNDEFINED)
         helper = _mako_get_namespace(context, 'helper')
-        messages = context.get('messages', UNDEFINED)
-        post = context.get('post', UNDEFINED)
         comments = _mako_get_namespace(context, 'comments')
-        pheader = _mako_get_namespace(context, 'pheader')
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
+        messages = context.get('messages', UNDEFINED)
+        pheader = _mako_get_namespace(context, 'pheader')
+        enable_comments = context.get('enable_comments', UNDEFINED)
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        post = context.get('post', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n')
         __M_writer('\n')
@@ -62,15 +62,15 @@ def render_body(context,**pageargs):
 def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
-        enable_comments = context.get('enable_comments', UNDEFINED)
         helper = _mako_get_namespace(context, 'helper')
-        messages = context.get('messages', UNDEFINED)
-        post = context.get('post', UNDEFINED)
         comments = _mako_get_namespace(context, 'comments')
-        pheader = _mako_get_namespace(context, 'pheader')
-        site_has_comments = context.get('site_has_comments', UNDEFINED)
         def content():
             return render_content(context)
+        messages = context.get('messages', UNDEFINED)
+        pheader = _mako_get_namespace(context, 'pheader')
+        enable_comments = context.get('enable_comments', UNDEFINED)
+        site_has_comments = context.get('site_has_comments', UNDEFINED)
+        post = context.get('post', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<article class="storypage" itemscope="itemscope" itemtype="http://schema.org/Article">\n    <header>\n        ')
         __M_writer(str(pheader.html_title()))
@@ -95,6 +95,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "story.tmpl", "source_encoding": "utf-8", "line_map": {"86": 19, "75": 7, "76": 10, "77": 10, "78": 11, "79": 11, "80": 14, "81": 14, "82": 16, "83": 17, "84": 18, "85": 18, "22": 2, "87": 19, "88": 22, "25": 3, "90": 22, "28": 4, "96": 90, "34": 0, "48": 2, "49": 3, "50": 4, "51": 5, "89": 22, "56": 24, "62": 7}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/story.tmpl"}
+{"line_map": {"86": 19, "75": 7, "76": 10, "77": 10, "78": 11, "79": 11, "80": 14, "81": 14, "82": 16, "83": 17, "84": 18, "85": 18, "22": 2, "87": 19, "88": 22, "25": 3, "90": 22, "28": 4, "96": 90, "34": 0, "48": 2, "49": 3, "50": 4, "51": 5, "89": 22, "56": 24, "62": 7}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/story.tmpl", "uri": "story.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/tag.tmpl.py b/cache/.mako.tmp/tag.tmpl.py
index 81b511a6..7504304e 100644
--- a/cache/.mako.tmp/tag.tmpl.py
+++ b/cache/.mako.tmp/tag.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.563465
+_modified_time = 1434160807.7545898
 _enable_loop = True
 _template_filename = '/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/tag.tmpl'
 _template_uri = 'tag.tmpl'
@@ -28,22 +28,22 @@ def render_body(context,**pageargs):
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         tag = context.get('tag', UNDEFINED)
-        description = context.get('description', UNDEFINED)
-        title = context.get('title', UNDEFINED)
-        len = context.get('len', UNDEFINED)
-        subcategories = context.get('subcategories', UNDEFINED)
-        parent = context.get('parent', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
-        posts = context.get('posts', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
         kind = context.get('kind', UNDEFINED)
-        def extra_head():
-            return render_extra_head(context._locals(__M_locals))
-        _link = context.get('_link', UNDEFINED)
-        date_format = context.get('date_format', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
         generate_rss = context.get('generate_rss', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
+        title = context.get('title', UNDEFINED)
+        date_format = context.get('date_format', UNDEFINED)
+        posts = context.get('posts', UNDEFINED)
+        parent = context.get('parent', UNDEFINED)
+        _link = context.get('_link', UNDEFINED)
+        def extra_head():
+            return render_extra_head(context._locals(__M_locals))
+        len = context.get('len', UNDEFINED)
+        description = context.get('description', UNDEFINED)
+        subcategories = context.get('subcategories', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n\n')
         if 'parent' not in context._data or not hasattr(context._data['parent'], 'extra_head'):
@@ -65,14 +65,14 @@ def render_extra_head(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         tag = context.get('tag', UNDEFINED)
-        len = context.get('len', UNDEFINED)
-        parent = context.get('parent', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
         kind = context.get('kind', UNDEFINED)
+        generate_rss = context.get('generate_rss', UNDEFINED)
+        parent = context.get('parent', UNDEFINED)
+        _link = context.get('_link', UNDEFINED)
         def extra_head():
             return render_extra_head(context)
-        _link = context.get('_link', UNDEFINED)
-        generate_rss = context.get('generate_rss', UNDEFINED)
+        len = context.get('len', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n    ')
         __M_writer(str(parent.extra_head()))
@@ -104,20 +104,20 @@ def render_extra_head(context,**pageargs):
 def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
-        description = context.get('description', UNDEFINED)
         tag = context.get('tag', UNDEFINED)
-        title = context.get('title', UNDEFINED)
-        subcategories = context.get('subcategories', UNDEFINED)
-        len = context.get('len', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
-        posts = context.get('posts', UNDEFINED)
         translations = context.get('translations', UNDEFINED)
         kind = context.get('kind', UNDEFINED)
-        date_format = context.get('date_format', UNDEFINED)
-        _link = context.get('_link', UNDEFINED)
         def content():
             return render_content(context)
+        messages = context.get('messages', UNDEFINED)
         generate_rss = context.get('generate_rss', UNDEFINED)
+        title = context.get('title', UNDEFINED)
+        date_format = context.get('date_format', UNDEFINED)
+        posts = context.get('posts', UNDEFINED)
+        _link = context.get('_link', UNDEFINED)
+        len = context.get('len', UNDEFINED)
+        subcategories = context.get('subcategories', UNDEFINED)
+        description = context.get('description', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<article class="tagpage">\n    <header>\n        <h1>')
         __M_writer(filters.html_escape(str(title)))
@@ -179,6 +179,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "tag.tmpl", "source_encoding": "utf-8", "line_map": {"128": 21, "129": 23, "130": 24, "131": 24, "132": 24, "133": 26, "134": 27, "135": 27, "136": 27, "137": 27, "138": 27, "139": 29, "140": 31, "141": 32, "142": 33, "143": 34, "144": 35, "145": 35, "146": 35, "147": 35, "148": 35, "149": 35, "150": 35, "151": 35, "152": 38, "153": 39, "26": 0, "155": 39, "156": 39, "154": 39, "158": 41, "159": 43, "160": 44, "161": 45, "162": 46, "163": 46, "164": 46, "165": 46, "166": 46, "167": 46, "168": 46, "169": 46, "170": 46, "171": 46, "172": 46, "173": 48, "174": 50, "157": 39, "48": 2, "180": 174, "53": 13, "58": 51, "64": 4, "77": 4, "78": 5, "79": 5, "80": 6, "81": 7, "82": 8, "83": 8, "84": 8, "85": 8, "86": 8, "87": 8, "88": 8, "89": 8, "90": 8, "91": 10, "92": 11, "93": 11, "94": 11, "95": 11, "96": 11, "97": 11, "98": 11, "104": 16, "122": 16, "123": 19, "124": 19, "125": 20, "126": 21, "127": 21}, "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/tag.tmpl"}
+{"line_map": {"128": 21, "129": 23, "130": 24, "131": 24, "132": 24, "133": 26, "134": 27, "135": 27, "136": 27, "137": 27, "138": 27, "139": 29, "140": 31, "141": 32, "142": 33, "143": 34, "144": 35, "145": 35, "146": 35, "147": 35, "148": 35, "149": 35, "150": 35, "151": 35, "152": 38, "153": 39, "26": 0, "155": 39, "156": 39, "154": 39, "158": 41, "159": 43, "160": 44, "161": 45, "162": 46, "163": 46, "164": 46, "165": 46, "166": 46, "167": 46, "168": 46, "169": 46, "170": 46, "171": 46, "172": 46, "173": 48, "174": 50, "157": 39, "48": 2, "180": 174, "53": 13, "58": 51, "64": 4, "77": 4, "78": 5, "79": 5, "80": 6, "81": 7, "82": 8, "83": 8, "84": 8, "85": 8, "86": 8, "87": 8, "88": 8, "89": 8, "90": 8, "91": 10, "92": 11, "93": 11, "94": 11, "95": 11, "96": 11, "97": 11, "98": 11, "104": 16, "122": 16, "123": 19, "124": 19, "125": 20, "126": 21, "127": 21}, "source_encoding": "utf-8", "filename": "/usr/lib/python3.4/site-packages/nikola/data/themes/base/templates/tag.tmpl", "uri": "tag.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/.mako.tmp/tags.tmpl.py b/cache/.mako.tmp/tags.tmpl.py
index cf6527ea..e9db708d 100644
--- a/cache/.mako.tmp/tags.tmpl.py
+++ b/cache/.mako.tmp/tags.tmpl.py
@@ -4,7 +4,7 @@ UNDEFINED = runtime.UNDEFINED
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1434157207.5430803
+_modified_time = 1434160807.735144
 _enable_loop = True
 _template_filename = 'themes/bootstrap/templates/tags.tmpl'
 _template_uri = 'tags.tmpl'
@@ -28,10 +28,10 @@ def render_body(context,**pageargs):
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         items = context.get('items', UNDEFINED)
-        cat_items = context.get('cat_items', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context._locals(__M_locals))
+        cat_items = context.get('cat_items', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n\n')
@@ -49,10 +49,10 @@ def render_content(context,**pageargs):
     __M_caller = context.caller_stack._push_frame()
     try:
         items = context.get('items', UNDEFINED)
-        cat_items = context.get('cat_items', UNDEFINED)
-        messages = context.get('messages', UNDEFINED)
         def content():
             return render_content(context)
+        cat_items = context.get('cat_items', UNDEFINED)
+        messages = context.get('messages', UNDEFINED)
         title = context.get('title', UNDEFINED)
         __M_writer = context.writer()
         __M_writer('\n<h1>')
@@ -90,6 +90,6 @@ def render_content(context,**pageargs):
 
 """
 __M_BEGIN_METADATA
-{"uri": "tags.tmpl", "source_encoding": "utf-8", "line_map": {"64": 7, "65": 9, "66": 10, "67": 11, "68": 11, "69": 11, "70": 11, "71": 11, "72": 14, "73": 15, "74": 16, "75": 16, "76": 16, "77": 19, "78": 20, "79": 21, "80": 22, "81": 22, "82": 22, "83": 22, "84": 22, "85": 24, "26": 0, "91": 85, "37": 2, "42": 26, "48": 4, "58": 4, "59": 5, "60": 5, "61": 6, "62": 7, "63": 7}, "filename": "themes/bootstrap/templates/tags.tmpl"}
+{"line_map": {"64": 7, "65": 9, "66": 10, "67": 11, "68": 11, "69": 11, "70": 11, "71": 11, "72": 14, "73": 15, "74": 16, "75": 16, "76": 16, "77": 19, "78": 20, "79": 21, "80": 22, "81": 22, "82": 22, "83": 22, "84": 22, "85": 24, "26": 0, "91": 85, "37": 2, "42": 26, "48": 4, "58": 4, "59": 5, "60": 5, "61": 6, "62": 7, "63": 7}, "source_encoding": "utf-8", "filename": "themes/bootstrap/templates/tags.tmpl", "uri": "tags.tmpl"}
 __M_END_METADATA
 """
diff --git a/cache/lastdeploy b/cache/lastdeploy
index e4940595..fedc696e 100644
--- a/cache/lastdeploy
+++ b/cache/lastdeploy
@@ -1 +1 @@
-2015-06-13T01:00:11.082791
\ No newline at end of file
+2015-06-13T02:00:10.467195
\ No newline at end of file