Remove merging... (too complicated)
Moved some functionality to BitemporalEntity
Some more tests and docs