ENH: Cleanup of vectorized contains code, performance enhancements.

I removed the 2-dimensional version of `contains` and the new tests
reflect this change as well.