add other software plan types to commcare_edition
update domain info form to use the names for the new software plans
Merge pull request #2196 from dimagi/update-domain-info

Update domain info to include new software plans