Rollback db, reword masterlist_id => inv_master_list_id, re-migrate db
Remove excessive link_to workaround, and replace with previously-non-functional association
Replace instances of masterlist_id with inv_master_list_id