Auto-install puppet-mode
Set properly smartparens's default keymap
Pull in upstream changes