Path changes and git config fix
Merge branch 'master' of github.com:tobytripp/dotfiles

Conflicts:
	bash_profile
	gitconfig
	preferences.sh