OSX needs to source .bashrc on login
Merge branch 'master' of github.com:masteinhauser/dotfiles

* 'master' of github.com:masteinhauser/dotfiles:
  Minor updates and fixes