Back and forth with completion
Merge branch 'master' of github.com:mrevd/dotfiles

Conflicts:
	vim/vimrc.symlink