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

Conflicts:
	core/prelude-core.el
Merge remote-tracking branch 'upstream/master'