plugin cleaning
Merge branch 'master' of https://github.com/ggarlic/dotfiles

Conflicts:
	.vimrc