Remove lone single quote in email template

This was causing the rest of the variables not to be substituted
Revert "Try renaming revenue field names"

This reverts commit 791a549d5b913658badef5569b38ff16156a2a97.
This didn't fix the issue and the original names were easier to read
Correct wrong text in rep_name.label2
Update markup for comments field
Handle org_type_other in form and email