Fix for some whitespace-related issues.
New customizations for Aquamacs 2.5.
Updated .emacs