Merge pull request #1 from okfn/master

Sync to upstream
Contact form - discuss link and widget #241
Merge branch 'master' of github.com:okfn/okfn.github.com
Merge pull request #254 from loleg/master

Add Discuss links to contact form