Bind hippie-expand to Command+/ as well
Merge remote-tracking branch 'upstream/master'
update with some mod