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

diff --combined jekyll/_layouts/default.html
index f305b09bb85c3f89847edf69fb8425963f53d575,f2464d33384451be5d4ff84662fbe9c6920acb02..4124b15b7940b095284ce56b5694356adaf42f97
--- 1/jekyll/_layouts/default.html
--- 2/jekyll/_layouts/default.html
+++ b/jekyll/_layouts/default.html
@@@ -13,8 -13,7 +13,7 @@@
      <script type="text/javascript">
  
        var _gaq = _gaq || [];
-       _gaq.push(['_setAccount', 'UA-20018878-2']);
-       _gaq.push(['_setDomainName', 'nsovocal.com']);
+       _gaq.push(['_setAccount', 'UA-20018878-4']);
        _gaq.push(['_trackPageview']);
  
        (function() {
@@@ -39,7 -38,7 +38,7 @@@
      </nav>
      <div class="container">
        <div class="row main-container">
 -        <section class="span6 offset2">
 +        <section class="span7 offset1">
            {{ content }}
          </section>
          <aside class="span3 offset1">

diff --combined 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 --combined jekyll/index.html
index 2407e2b5bbc35f34c5002635f3c0f848bc0826bc,c3e27c6d22dd6ebe0ffd46ecd1b9b8730d722b7e..b56530bb9078ec5afd0b8e737d279c750d32e84c
--- 1/jekyll/index.html
--- 2/jekyll/index.html
+++ b/jekyll/index.html
@@@ -11,10 -11,10 +11,10 @@@ description: "N, S o Vocal. El lote aba
              <div class="span3">
                <i class="icon-tags"></i>
                  {% for tag in post.tags %}
-                   <a href="/">{{tag}}</a>
+                   <a href="/tags/{{tag}}">{{tag}}</a>
                  {% endfor %}
              </div>
-             <div class="span2"><i class="icon-folder-close"></i> <a href="/">{{ post.category }}</a></div>
+             <div class="span2"><i class="icon-folder-close"></i> <a href="/categories/{{ post.category }}">{{ post.category }}</a></div>
              <div class="span1"><i class="icon-calendar"></i> <a href="{{ post.url }}">{{ post.date | date: "%m/%e/%Y"}}</a></div>
            </div>
            <div class="postcontent">
@@@ -38,7 -38,7 +38,7 @@@
      &nbsp;
      {% endif %}
      </div>
 -    <div class="span2 offset2">
 +    <div class="span2 offset3">
      {% if paginator.next_page %}
        <a href="/page{{ paginator.next_page }}">Next Page &rarr;</a>
      {% else %}