added plugins, remade vimrc
Merge branch 'master' of https://github.com/webeith/vim

Conflicts:
	.vimrc