Emacs update
2014-12-14 eod