From 02314d4917e5f86786fa3623d7c76144bffc4883 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@originate.com>
Date: Mon, 11 Apr 2016 10:53:35 -0700
Subject: [PATCH] Resync

---
 dotfiles/emacs.d/init.el    | 11 +++++++++--
 dotfiles/emacs.d/package.el |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index ea5d526..2d2ba6a 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -323,12 +323,19 @@
 
 (ivy-mode 1)
 
-(setq projectile-completion-system 'ivy)
+;(setq projectile-completion-system 'ivy)
 (setq magit-complete-read-function 'ivy-completing-read)
 (setq ivy-use-virtual-buffers t)
 
 
 ;;-------------------------------------------------------------------------------------
+;; Use Grizzl with Projectile
+;;-------------------------------------------------------------------------------------
+
+(setq projectile-completion-system 'grizzl)
+
+
+;;-------------------------------------------------------------------------------------
 ;; Enable Autocomplete
 ;;
 ;; NOTE: You can replace the 't' in (setq ac-auto-start t) with a positive integer
@@ -468,7 +475,7 @@
 (global-set-key (kbd "RET") nil)
 
 ;; Unbind C-c p f from projectile
-(global-set-key (kbd "C-c p f") nil)
+;(global-set-key (kbd "C-c p f") nil)
 
 ;; Unbind C-s from Isearch to make room for swiper
 (global-set-key (kbd "C-s") nil)
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index b31419b..7e09cbf 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -1,7 +1,7 @@
 (require 'cl)
 
 (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck
-                         esh-help enh-ruby-mode ess flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
+                         grizzl esh-help enh-ruby-mode flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
                          fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode feature-mode
                          flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode