update bashrc settings from mba
Merge branch 'master' of https://github.com/jdonaldson/dotfiles
ignore tmp files