Restoring contact form, needs someone to update the CSS

This branch is in-progress -- it needs @mhz or @gboone to update the CSS to get the contact form back to what it was. It was removed before the semantic makeover of the markup, so it didn't get migrated with everything else.