Allow space to be used as separator

This isn't perfect. Using space as the separator along with units that
have spaces in the names (e.g., "imperial pint") can create ambiguity in
the query. In these cases, use underscores in the unit names
("imperial_pint") or don't use space as a separator.