Disable ido's annoying auto-merging of directories if no match is found
Always auto-skip closing pair
open file in new session, new process
Merge pull request #371 from eq42/async-open

open file in new session, new process
Clean up updated prelude-open-with
Make "C-x C-m" a true alias for M-x by binding it to smex.
Merge pull request #373 from benol/patch-1

Make "C-x C-m" a true alias for M-x by binding it to smex.
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
Merge remote-tracking branch 'upstream'

Conflicts:
	.gitignore