Some changes to .emacs, and added the bashrc for this machine