contact form now working. need to run a diff though.
Merge branch 'staging'