Added plugins
Merge branch 'master' of http://github.com/ushu/dotfiles

Conflicts:
	.vimrc
Improvements
Small conf update