Merge remote-tracking branch 'origin/master' into indent_guides

Conflicts:
	lib/ace/theme/textmate.css

lib/ace/editor.js

@@ -694,6 +694,9 @@ var Editor = function(renderer, session) {
      * called whenever a text "paste" happens.
      **/
     this.onPaste = function(text) {
+        // todo this should change when paste becomes a command
+        if (this.$readOnly) 
+            return;
         this._emit("paste", text);
         this.insert(text);
     };