Merge in upstream updates to puppet-emacs module