not running prompt stuff on osx
Merge branch 'master' of github.com:cairo140/config

Conflicts:
	bashrc