Fixed email
Push emacs into its own tag
Push nautilus on to its own tag
Commit
Merge branch 'master' of github.com:daniellawrence/dot-files

Conflicts:
	dot-gitconfig
	setup-git.sh