Update bash completion

Still ad-hoc but less ugly than before