Merge my SSL changes in from prod box
Added Mollom, updated captcha and zeropoint
Merge branch 'Ogre/7' into Ogre/7-cosmo

* Ogre/7:
  Added Mollom, updated captcha and zeropoint
  Merge my SSL changes in from prod box