Removed u prefix from strings and use from __future__ import unicode_literals. Added @python_2_unicode_compatible to several classes. Removed unicode calls and encoded unicode where we needed bytestrings