Back out hibernate.  Leave in the bug fixes found by hibernate's
different validation.
accomidate shift in where attribute is located
Merge pull request #29 from ChiralBehaviors/hibernate-highlighted-bugfixes

Hibernate highlighted bugfixes