Auto-install puppet-mode
Set properly smartparens's default keymap
Merge remote-tracking branch 'refs/remotes/upstream/master'

Merge with bbatsov's repo

	modified:   core/prelude-editor.el
	modified:   core/prelude-packages.el