Auto-install puppet-mode
Set properly smartparens's default keymap
Add new command prelude-youtube
Merge remote-tracking branch 'refs/remotes/upstream/master'
Adding automatic copyright insertion.
Merge branch 'master' of github.com:jason-woytowich/emacs-config

Conflicts:
	personal/general.el