 ; disable all version control minor modes
 (setq vc-handled-backends ())
 
-; General indentation behavior {{{
+; General indentation behavior
 ; pressing TAB inserts a TAB
 (define-key text-mode-map (kbd "TAB") 'self-insert-command)
 (global-set-key (kbd "TAB") 'self-insert-command)
-;}}}
-
-; Modes {{{
-
-; Evil {{{
+
+; Modes
+
 ; Evil, the Extensible VI Layer! This makes Emacs worth using.
 ; see http://gitorious.org/evil/pages/Home
-(require 'evil)
-(evil-mode 1)
 (define-key evil-normal-state-map [f1] 'menu-bar-mode) ; toggle the menu bar
 (define-key evil-normal-state-map ",w" 'save-buffer) ; save
 (define-key evil-normal-state-map ",W" ":w!") ; force save

	)
)

; YAML {{{
(require 'yaml-mode)
(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
; disable YAML keymaps, as they interfere with Evil (especially the [backspace] keymap)
(setq yaml-mode-map (make-sparse-keymap))
;}}}

;}}}

; Appearance {{{
; a custom syntax highlighting setup for just numbers (hex, decimal, etc.);
; adopted from http://stackoverflow.com/questions/8860050/emacs-c-mode-how-do-you-syntax-highlight-hex-numbers
(make-face 'font-lock-hex-face)

  'japanese-jisx0208
  '("IPAGothic" . "unicode-bmp"))

; Custom functions
(defun my-addrem-comment-region (b e f)
  "Use the `dc' command to comment the current region."
  (interactive)
