Bind hippie-expand to Command+/ as well
Add `prelude-github`

Conflicts:
	core/prelude-core.el
Use move-text to allow moving up or down of the selected region as well
[Fix #365] Don't indent with tabs in c-mode
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' into rock-mac