add puppet mode, align code and some local elisp files