diff --git a/package.json b/package.json
index 5be70aa4c762322f93b7460ed097acc2bef0c80f..0db9019861718d1642a79569962640646bed129c 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
     "node-fs-extra": "^0.8.1",
     "node-sass": "^3.4.2",
     "nodegit": "^0.11.7",
-    "nodegit-kit": "^0.8.1",
     "nunjucks": "^2.3.0",
     "nunjucks-date-filter": "^0.1.1",
     "syntax-error": "^1.1.5",
diff --git a/sitegin/gitInfo.js b/sitegin/gitInfo.js
index d92815322e50fd5095c5d5a616d097ae1512ac2b..867cac524feb47fb36e0faa2ea3973213ed03bce 100644
--- a/sitegin/gitInfo.js
+++ b/sitegin/gitInfo.js
@@ -4,7 +4,6 @@
  */
 
 var nodegit = require('nodegit');
-var git = require('nodegit-kit');
 var path = require('path');
 var moment = require('moment');
 
@@ -45,12 +44,51 @@ var gitShow = function(repo, commitData) {
     });
 }
 
+var gitlog = function(repo) {
+  var map = function(repo){
+    return Promise.resolve()
+    .then(function(){
+      return function(commit){
+        var author = commit.author();
+        var sha = commit.sha();
+
+        return {
+          'commit': sha,
+          'author': {
+            'name': author.name(),
+            'email': author.email()
+          },
+          'date': commit.date(),
+          'message': commit.message().trim()
+        };
+      };
+    });
+  };
+
+
+  return repo.getHeadCommit()
+  .then(function(commit) {
+    return new Promise(function(resolve, reject){
+      commit.history()
+      .on('end', resolve)
+      .on('error', reject)
+      .start();
+    })
+    .then(function(commits){
+      return map(repo)
+      .then(function(log){
+        return commits.map(log);
+      });
+    });
+  });
+};
+
 var getFilesHistory = function() {
   var repo;
-  return git.open(pathToRepo)
+  return nodegit.Repository.open(pathToRepo)
   .then(function(_repo) {
     repo = _repo;
-    return git.log(repo)
+    return gitlog(repo)
   })
   .then(function(log){
     var promises = [];
diff --git a/sitegin/tags.js b/sitegin/tags.js
index 3041b3c0e57293153aea7a50c59b102789cb3757..86390ced2833c462f33082d4fde33140cf6da209 100644
--- a/sitegin/tags.js
+++ b/sitegin/tags.js
@@ -40,6 +40,8 @@ module.exports = function(obj) {
       obj.redirects.push(pg);
 
       pageList.sort(function (a, b) {
+        if(a.metadata.date === undefined) return -1;
+        if(b.metadata.date === undefined) return 1;
         var rhs = a.metadata.date.creation;
         var lhs = b.metadata.date.creation;
         return lhs > rhs ? 1 : lhs < rhs ? -1 : 0;