Add puppet-mode
Explicitly tell magit to use emacsclient

This is needed to work around a bug in magit.  See
http://stackoverflow.com/questions/18856047/emacs-magit-commit-opens-new-emacs-client.