Change models and blew away crappy migrations
Allow default country code for uploads
Fix broken tests