Remove LocalTime from tests
Merge remote-tracking branch 'origin/persistent2' into persistent2

Conflicts:
	persistent-test/DataTypeTest.hs
	persistent-test/persistent-test.cabal