form clean-up
Merge branch 'forms' of github.com:osmlab/openstreetmap-website into forms