Made cascading merge pass JPA rules 1-4 inclusive (tests for 5 and 6 still pending)
Renamed a few things after a quick walkthrough/review with csadilek
Added the remaining collection-valued merge tests, and made all the merge tests work with Hibernate