Tweak the conditional pieces
Merge pull request #7 from codeforamerica/form

Tweak the conditional pieces