more db refactoring; added ability to use ORM directly to db rather than using the Content Provider.  useful for migrations, tests and likely just faster in general.
fix db version back to 4 as it should be