Merge pull request #61 from sGerli/dev/home-plus-blog

Fix pagination and partially fix selected page

Author: ishotjr

_includes/siteindex.html

@@ -1,7 +1,7 @@
 <ul id="index">
     {% for item in site.data.index %}
         <li>
-            <a {% if item.permalink and page.permalink == item.permalink %} class="selected" {% endif %}
+            <a {% if page.url == item.permalink %} class="selected" {% endif %}
                {% if item.link %}
                    href="{{ item.link }}"
                {% else %}

blog/index.html

@@ -2,7 +2,7 @@
 layout: default
 title: "Blog"
 
-permalink: /blog/
+baseUrl: /blog/
 ---
 <div id="posts">
     {% for post in paginator.posts %}