fix vimrc
Merge branch 'master' of github.com:legolassid/dotvim

Conflicts:
	vimrc