Use symlinks for great justice (and sane updates)!
Merge branch 'master' of github.com:LinuxMercedes/dotvimrc

Conflicts:
	setup.sh