Updated plugins
Merge branch 'master' of ssh://github.com/kainlite/dotfiles

Conflicts:
	.gitmodules
Updated and removed plugins..