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
Submodule update
Merge branch 'master' of git://github.com/bbatsov/prelude

Conflicts:
	.gitignore
Merge branch 'master' into rock-mac