Stash swap and backup files in a directory.
Merge branch 'master' of github.com:jlefrique/dotfiles

Conflicts:
	vim/cache/.gitignore