Bind hippie-expand to Command+/ as well
Merge branch 'upstream'