Merge remote-tracking branch 'origin/osx_cole_inigral'
Merge remote-tracking branch 'origin/osx_detune'

Conflicts:
	.bashrc
updates
Merge branch 'master' of github.com:coledot/dotfiles
Merge branch 'osx_cole_inigral'