Updated requirements to fix html5lib at a version (for django-cms)
Merge remote branch 'origin/master'
Inlined pybbm into our own source base

This will form a baseline for 'blunt axe' changes to it
since pybbm does not supply us with sufficient hooks to make changes in a more organized fashion
Added CAPTCHA to anonymous forum posts