Update .emacs

* Updated to work with plain Emacs from http://emacsformacosx.com/
* Removes some excess cruft
* Addes update-aquamacs function.