Correctly detect OS on Mac OSX.

Previously, we would detect Unix first (correctly), then short-circuit,
and never detect Mac OSX.

I would like to rewrite DETECT-OS.  The code seems opaque.  But this is
correct, so committing it now, since it used to be broken.