updated settings in .bashrc and .emacs
Merge branch 'master' of github.com:peteyoung/dotfiles
Changes from machine 1 merged in