Modify civicrm_custom_option for custom field usage

I changed the schema, so civicrm_custom_option now uses entity_table, entity_id rather than civicrm_custom_field_id (this allow me to reuse the option table for donation amounts)

Can we get someone to go fix the rest of the code to do the right thing for the above change