Almost get tests passing on hstore
Merge branch 'hstore_tests'