          ("M-s M-r" . counsel-recentf)
          ("M-s M-p" . counsel-git-grep)
          ("M-s M-g" . counsel-grep)
+         ("M-s M-y" . counsel-yank-pop)
          ("M-s M-z" . counsel-git-stash)
          ("M-s M-i" . counsel-imenu)
          ("M-s M-l" . counsel-git-log)

;; Author: Dan Harms <danielrharms@gmail.com>
;; Created: Friday, February 27, 2015
;; Version: 1.0
;; Modified Time-stamp: <2016-09-12 19:11:11 dharms>
;; Modified by: Dan Harms
;; Keywords:


;; terminal as well).
(define-key esc-map "'" nil)
(global-unset-key (kbd "<f1>"))
;; add shortcut for terminals where C-S-DEL doesn't work
(global-set-key (kbd "M-' DEL") 'kill-whole-line)
(global-set-key [(next)] 'scroll-up-line)
(global-set-key [(prior)] 'scroll-down-line)
(global-set-key "\C-caa" 'align)
