disable swapping
Merge branch 'master' of https://github.com/majn/vimrc

Conflicts:
	link.sh