Updated migrations to separate data migrations and schema migrations.
Cleaned up some code.  Need to remove mockito.  Incorrect proxy wiring is causing NPE