Simplify and improve my hippie-expand function

Shamelessly stolen from @purcell actually ;)