Added a few plugins, removed needless configs
Merge branch 'master' of https://github.com/zgstyle/.vim

Conflicts:
	vimrc