resolve merge conflict

.gitignore

@@ -8,4 +8,5 @@ projectile-bookmarks.eld
 projectile.cache
 auto-save-list
 backups
-melpa-stable
+melpa-stable
+archive-contents

customizations/editing.el

@@ -51,9 +51,6 @@
   (comment-or-uncomment-region (line-beginning-position) (line-end-position)))
 (global-set-key (kbd "C-;") 'toggle-comment-on-line)
 
-;; yay rainbows!
-(global-rainbow-delimiters-mode t)
-
 ;; use 2 spaces for tabs
 (defun die-tabs ()
   (interactive)

customizations/navigation.el

@@ -44,7 +44,8 @@
 
 ;; This enables ido in all contexts where it could be useful, not just
 ;; for selecting buffer and file names
-(ido-ubiquitous-mode 1)
+(ido-ubiquitous-mode t)
+(ido-everywhere t)
 
 ;; Shows a list of buffers
 (global-set-key (kbd "C-x C-b") 'ibuffer)

customizations/setup-clojure.el

@@ -23,14 +23,15 @@
                ("(\\(background?\\)"
                 (1 font-lock-keyword-face))))
             (define-clojure-indent (fact 1))
-            (define-clojure-indent (facts 1))))
+            (define-clojure-indent (facts 1))
+            (rainbow-delimiters-mode)))
 
 ;;;;
 ;; Cider
 ;;;;
 
 ;; provides minibuffer documentation for the code you're typing into the repl
-(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
+(add-hook 'cider-mode-hook 'eldoc-mode)
 
 ;; go right to the REPL buffer when it's finished connecting
 (setq cider-repl-pop-to-buffer-on-connect t)