Moved two persistence.xml files into one.

I'll implement compile time switches via environmental variables next.