fedora modifications
Merge branch 'master' of https://github.com/JonathanReeve/dotfiles

Conflicts:
	setup.sh