Merge branch 'soon' into staging

www/code/main.js

@@ -197,8 +197,8 @@ define([
 
                 /* add a history button */
                 var histConfig = {
-                    onLocal: config.onLocal(),
-                    onRemote: config.onRemote(),
+                    onLocal: config.onLocal,
+                    onRemote: config.onRemote,
                     setHistory: setHistory,
                     applyVal: function (val) {
                         var remoteDoc = JSON.parse(val || '{}').content;