Clean up some of the ridiculous number of silly NULLable fields
Oops, commit models too
Minor fix to migration 0068