Update path
Attempt to sniff os x
Ubuntu aliases
Gitconfig
http://mths.be/osx
Rm solarise
Merge branch 'master' of github.com:michaeljoseph/dotfiles

Conflicts:
	osx.bash
	ubuntu.bash