Crog/jpa config update

A new PR against master instead of old gutterball-hibernate branch.

Old PR is #750
Reformatting for no real reason.