Merged Join Us and Contact Us forms

Now just one form at /contact/
Merge branch 'master' of https://github.com/cshc/cshc_website