Auto-install puppet-mode
Merge remote-tracking branch 'upstream/master'