more editing of docs
Merge branch 'version3' of github.com:LuminosoInsight/python-ftfy into version3
Merge a long-forgotten doc change
Merge branch 'master' of github.com:LuminosoInsight/python-ftfy
weirdify the linebreak doctest for Python 2 compatibility