Added collective.recaptcha to buildout and proper branches for the discussion feature