test install
Merge branch 'master' of github.com:HoplaGeiss/vimConfiguration

Conflicts:
	vimrc