Add autoloads for PKGBUILD and .zsh file
Enable subword mode
Add kk keychord for just-one-space
Merge pull request #320 from toctan/master

Add autoloads of major modes for PKGBUILD and .zshrc file
Do not show the tip if cursor is in the minibuffer
Bind `KK` to `delete-horizontal-space`
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.
Merge branch 'master' of https://github.com/bbatsov/prelude
Add session* to .gitignore
Merge pull request #321 from toctan/master

Do not show the tip if the cursor is in the minibuffer window
Merge commit 'ca4ae2e4f81fc27b01cf3c6913765182099c987e'

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