Merged OS X and Ubuntu .bashrc
Merge branch 'master' of https://github.com/wdpreez1/bashconf