move some OS X stuff from .bash_profile into the generic .profile
fix some dumb conditional syntax problems