Kasper, I've taken your changes from here:
And merged them cleanly without all the other changes that were in your pull request. Can you double check that this works and push it if you're happy with it?
Kasper's fix for USB drives with spaces in their names.
Kasper, I tested this on my Linux box with a key called "CARLA GREAT" (she stole your nickname) and it worked, well, great.
worked like a charm.. thanks colin