Ignore .cask
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Auto-install puppet-mode
Set properly smartparens's default keymap
Add new command prelude-youtube
Don't swap Command & Option by default
[Fix #378] Add folders recursively to the load-path in prelude-add-subfolders-to-load-path
[Fix #377] Require smartparens-latex in latex module
Enable smartparens in the minubuffer during eval-expression
Add a basic version check
Bind hippie-expand to Command+/ as well
Merge remote-tracking branch 'refs/remotes/upstream/master'