Merge pull request #28 from iguananaut/units-refactor-quantity

Gets the tests at least passing with Quantity as an ndarray subclass
Restore __array_wrap__