new settings and plugins
Merge branch 'master' of github.com:boychi/vimb

Conflicts:
	install.sh
	vimrc