Archiving old vim bundles
Clean out submodules
Clean out old vim setup
Merge branch 'master' of github.com:jrk/vimfiles

Conflicts:
	vimrc