Added some new plugins.
Merge branch 'master' of github.com:LuqiPan/dotvim

Conflicts:
	.gitmodules
Updated vimrc again. Gonna have conflicts.