Improve .vimrc, remove some plugins
Merge branch 'master' of github.com:tang3w/.vim

Conflicts:
	.vimrc