Merged differences from OS X .bashrc.
Tabified.