Simplified my vim configuration
Merge branch 'master' of ssh://github.com/johan-adriaans/Dotfiles

Conflicts:
	.profile