Emacs config update
Google config update
Merge