Cleaned up the .emacs file.
Phase 1 cleanup.

Change-Id: Id4110babc8529335a4052ad07419b0d95e497570