Added several plugins
Merge branch 'master' of https://github.com/jimbz/dotfiles

Conflicts:
	vim/vimrc