FSwitch plugin
Merge branch 'master' of github.com:kwalo/vimrc

Conflicts:
	.gitmodules