diff --git a/VERSION b/VERSION
index d709881f..88472f12 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-02 16:44:25) dev
+Version 2.00.0 (2012-06-04 16:03:19) dev
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index 5c64ebfc..f0a7f764 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -42,7 +42,7 @@
         <script>
             var keybinding = require("ace/keyboard/keybinding/emacs").Emacs;
         </script>
-    {{elif TEXT_EDITOR_KEYBINDING == 'emacs':}}
+    {{elif TEXT_EDITOR_KEYBINDING == 'vi':}}
         <script src="{{=URL(r=request,c='static',f='ace/src/keybinding-vi.js')}}" type="text/javascript" charset="utf-8"></script>
         <script>
             var keybinding = require("ace/keyboard/keybinding/vim").Vim;
@@ -128,7 +128,7 @@ window.onload = function() {
 		name: 'saveFile',
 		bindKey: {
 			win: 'Ctrl-S',
-			mac: 'Command-S',
+			mac: 'Ctrl-S',
 			sender: 'editor|cli'
 		},
 		exec: function(env, args, request) {