Force symlinks
Merge branch 'master' of https://github.com/OliverJAsh/dotfiles

Conflicts:
	setup.sh