Add setup script
Merge branch 'master' of github.com:OliverJAsh/dotfiles

Conflicts:
	setup.sh