Clean up the datamodel some. Still needs to start using play evolutions