Minor fixes to website generation

docs/templates/shared/_head.html.j2

@@ -7,7 +7,7 @@
     <title>{{headline}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="canonical" href="{{ url }}{{ permalink | replace('/index','') }}" />
+    <link rel="canonical" href="{{ url }}/{{ permalink }}" />
     <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
     <link rel="stylesheet" href="{{ root }}/css/base.css" type="text/css">
     <!--[if lt IE 9]>

docs/templates/shared/_navbar.html.j2

@@ -13,8 +13,8 @@
         <div class="navbar-collapse collapse" id="nav-collapse">
           <ul class="nav navbar-nav">
             {% for item in navigation %}
-              <li {% if item == permalink %} class="active" {% endif %}>
-                <a href="{{root}}/{{item}}">{{item | capitalize}}</a>
+              <li {% if item == navitem %} class="active" {% endif %}>
+                <a href="{{root}}/{{item}}/">{{item | capitalize}}</a>
               </li>
             {% endfor %}
             <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>