tweak publish to gh-pages

Author: ksperling

Gruntfile.js

@@ -103,6 +103,8 @@ module.exports = function (grunt) {
       ensureCleanMaster().then(function () {
         shjs.rm('-rf', 'build');
         return system('git checkout gh-pages');
+      }).then(function () {
+        return system('git merge master');
       }).then(function () {
         return system('grunt dist');
       }).then(function () {