Emacs - bookmarks
Emacs - rinari
Emacs - helm
Emacs - ido
Emasc - refactoring
Emacs - add git-gutter
Merge branch 'master' of github.com:colbell/dotfiles

Conflicts:
	emacs.d/cnb/cnb-global-keys.el