(PUP-2237) Updates to Emacs puppet-mode for indentation, XEmacs, file name matching