add some plugins
Merge branch 'master' of https://github.com/primitivorm/vim-proman-vimrc

Conflicts:
	.vimrc
update .vimrc
Merge branch 'master' of https://github.com/primitivorm/vim-proman-vimrc

update vimrc