Scroll to contact form for your-city
Change wording for drop down options
Resolve merge conflict
Merge pull request #2 from codeforamerica/your-city-scroll

Scroll to contact form for your-city
Merge branch 'master' into gh-pages