Swapped gs.content.form and gs.content.form.api.json so they would work
Merge branch '2014-zope-upgrade' of github.com:e-democracy/buildout-config into 2014-zope-upgrade