diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index be5d634..c4f39b3 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -171,6 +171,15 @@ There are two things you can do about this warning:
 
 (ivy-mode 1)
 
+(setq ivy-use-virtual-buffers t)
+(setq enable-recursive-minibuffers t)
+
+;; Configure ivy to be similar to flx-ido.
+(setq ivy-re-builders-alist
+      '((t . ivy--regex-plus)))
+
+(setq ivy-initial-inputs-alist nil)
+
 ;; Enable column numbers
 (column-number-mode 1)
 
@@ -344,12 +353,22 @@ There are two things you can do about this warning:
 ;; Load up swiper search with C-s
 (global-set-key "\C-s" 'swiper)
 
+;; High powered fuzzy searching for large projects using
+;; projectile--find-file.
+(global-set-key (kbd "C-x f") 'projectile--find-file)
+
+;; Ivy
+(global-set-key (kbd "C-c C-r") 'ivy-resume)
+
 ;; Switch windows with M-o
 (global-set-key (kbd "M-o") 'other-window)
 
 ;; Bind pytest in python mode to M-p
 (define-key python-mode-map (kbd "M-p") 'python-pytest-file)
 
+;; Git - Magit
+(global-set-key (kbd "C-x g") 'magit-status)
+
 ;; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Lisp Binds ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ;; Note: SLIME bindings require slime to be running.
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index d0be4a5..a7b91f2 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -16,6 +16,7 @@
 
                       eclim
                       irony
+		      ivy
                       counsel
                       swiper
 
@@ -93,7 +94,7 @@
                       flycheck
                       flycheck-pos-tip
 		      flycheck-rtags
-                      grizzl
+		      flx
                       smex
                       projectile
 		      counsel-gtags