Use bleach on user-submitted text before marking safe
Update pinned version of html5lib
Merge pull request #303 from PyCon/safe-text

Safe text
Merge branch 'production' of github.com:PyCon/pycon into staging