Merge pull request #6 from codeforamerica/form

Follow-up form
Tweak the conditional pieces