Merged in moreati/six/moreati/clarify-wording-of-u-vs-u-for-python-3-1440158751679 (pull request #68)

Clarify wording of u'' vs u() for Python 3