Cleaned up Emacs code

As per @dudebout comments at https://github.com/tmhedberg/hsenv/pull/24