Cleaned and removed old settings.
Merge branch 'master' of github.com:benedicteb/Vim-Setup

Conflicts:
	vim/vimrcpy