some minor adaptions
Merge branch 'master' of github.com:gradel/vim-config

Conflicts:
	.vimrc