add fzf source, mpv, fix some keyboard shortcuts
Merge branch 'master' of github.com:spencerdchan/dotrepo

Conflicts:
	osx.sh