updated setup script
Merge branch 'master' of https://github.com/JamesKnott/Scripts

Conflicts:
	install/setup_git_fedora.sh