 ;; Shift-direction to move between windows 
 (windmove-default-keybindings)
 
+;; Comment shortcut
+(global-set-key (kbd "\C-x C-/") 'comment-or-uncomment-region)
+
+;; C-z is dumb
+(global-set-key (kbd "\C-z") nil)
+
+;; Ergo-key binding
+;; Vim curser movement
+(global-set-key (kbd "M-k") 'previous-line)
+(global-set-key (kbd "M-h") 'backward-char)
+(global-set-key (kbd "M-j") 'next-line)
+(global-set-key (kbd "M-l") 'forward-char)
+
+;; Word-movement
+(global-set-key (kbd "M-u") 'backward-word)
+(global-set-key (kbd "M-i") 'forward-word)
+(global-set-key (kbd "M-f") 'kill-word)
+(global-set-key (kbd "M-d") 'backward-kill-word)
+
+;; Marks &c.
+(global-set-key (kbd "M-SPC") 'set-mark-command)
+(global-set-key (kbd "<f2>") 'xah-cut-line-or-region)
+(global-set-key (kbd "<f3>") 'xah-copy-line-or-region)
+(global-set-key (kbd "<f4>") 'yank)       ; paste
+
+;; Extra
+(global-set-key (kbd "M-.") 'keyboard-escape-quit)
+(global-set-key (kbd "M-/") 'undo)
+(global-set-key (kbd "M-r") (kbd "C-m")) ; return
+(global-set-key (kbd "M-e") (kbd "C-i")) ; tab
+(put 'downcase-region 'disabled nil)
+;; ===================================================================
+
+
+
+;; Octave-mode
+;; ===================================================================
+(autoload 'octave-mode "octave-mod" nil t)
+(setq auto-mode-alist
+(cons '("\\.m$" . octave-mode) auto-mode-alist))
+;; ===================================================================
+
+
+
 ;; Multi-web-mode
+;; ===================================================================
 (add-to-list 'load-path "~/.emacs.d/multi-web-mode")
 (require 'multi-web-mode)
    (setq mweb-default-major-mode 'html-mode)


;; "The columns, Duke, the columns!"
(column-number-mode) 
;; ===================================================================



                      (css-mode "<style +type=\"text/css\"[^>]*>" "</style>")))
   (setq mweb-filename-extensions '("php" "htm" "html" "ctp" "phtml" "php4" "php5"))
   (multi-web-global-mode 1)
;; ===================================================================



;; Evil-mode
;; ===================================================================
;(add-to-list 'load-path "~/.emacs.d/evil-mode")
;(require 'evil)
;(evil-mode 0)
;; Switch : to ; in evil-mode
;(define-key evil-normal-state-map (kbd ";") 'evil-ex)
;; ===================================================================



;; Lua-mode
;; ===================================================================
(add-to-list 'load-path "~/.emacs.d/lua-mode")
(autoload 'lua-mode "lua-mode" "Lua editing mode." t)
(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
(add-to-list 'interpreter-mode-alist '("lua" . lua-mode))
;; ===================================================================


;; tmux stuff
;; http://unix.stackexchange.com/questions/24414/shift-arrow-not-working-in-emacs-within-tmux
;; ===================================================================
;; handle tmux's xterm-keys
;; put the following line in your ~/.tmux.conf:
