Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.
Thanks simon@ for the suggestion and JordanPowell for the initial patch.