   (split-window-horizontally)
   (split-window-horizontally)
   (balance-windows))
-(global-set-key [f5] 'oth-split-and-balance)
+;(global-set-key [f5] 'oth-split-and-balance)
 (global-set-key [f7] 'delete-other-windows-vertically)
 
 (global-set-key [(control x) (v) (b)] 'magit-status)
-;; (global-unset-key (kbd "C-x g"))
+(global-set-key (kbd "C-x g") 'magit-status)
 
 ; confirm leaving Emacs (why would you want to, right?)
 (setq kill-emacs-query-functions

	     :pin melpa-stable)
;(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)

;; (require 'whitespace)
;; (setq whitespace-line-column 80)
;; (setq whitespace-style '(face-lines-tail))
;; (add-hook 'prog-mode-hook 'whitespace-mode)
;;
;; DEPRECATED but kept for sentimental or documentation reasons
;;

; == C-x 3
(global-set-key [f3] 'split-window-horizontally)
; == C-x o
(global-set-key [(control tab)] 'other-window)
(global-set-key [f4] 'other-window)
; join this and next line
(global-set-key [f8] (lambda() (interactive) (join-line 1)))
