Back out form changes

Changes to form styling broke the maps API call (somehow).  Debug on
master before merging to gh-pages to push it live.

This reverts commit fcc77278c3184972c5ff11f5e8b024cc0262787c.
Merge branch 'gh-pages'