Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal

diff --cc jekyll/_layouts/default.html
Simple merge

diff --cc jekyll/_layouts/post.html
index 395f741f66061d2dfc8faea34fd7ba83eddd054c,ba87cce519a828f1aff1e2f7cb298f69a98c05a9..4fe1cca2d73bf7df13827d58b5bc3525e239f57a
--- 1/jekyll/_layouts/post.html
--- 2/jekyll/_layouts/post.html
+++ b/jekyll/_layouts/post.html
@@@ -8,13 -8,13 +8,13 @@@ layout: defaul
              {{ page.author_email | gravatar_tag }} <a href="mailto:{{page.author_email }}" class="author">{{ page.author_name }}</a>
            </div>
            <div class="posttags row">
 -            <div class="span3">
 +            <div class="span4">
                <i class="icon-tags"></i>
                  {% for tag in page.tags %}
-                   <a href="/">{{tag}}</a>
+                   <a href="/tags/{{tag}}">{{tag}}</a>
                  {% endfor %}
              </div>
-             <div class="span2"><i class="icon-folder-close"></i> <a href="/">{{ page.category }}</a></div>
+             <div class="span2"><i class="icon-folder-close"></i> <a href="/categories/{{page.category}}">{{ page.category }}</a></div>
              <div class="span1"><i class="icon-calendar"></i> <a href="{{ page.url }}">{{ page.date | date: "%m/%e/%Y"}}</a></div>
            </div>
            <div class="postcontent">

diff --cc jekyll/index.html
Simple merge