Add fzf.
Merge branch 'master' of github.com:afishnamedsquish/dotfiles

Conflicts:
	vim/vimrc