updated vimrc and plugins
Merge branch 'master' into google

Conflicts:
	.vimrc
updated vimrc
updated vimrc
updated vimrc
updated vimrc