Moved osx stuff to a separate profile.
Merge remote-tracking branch 'origin/master'

Conflicts:
	_profile
Cleanup