remigrate to clean up a couple of DB fields
addresses naming convention problems in class and table names
new image for schema
merge associations to master