Removed u-prefixed unicode strings and used the __future__ unicode_literals
Added __init__.py to tests/integration to be importable as a python package
Merge branch 'master' into python3-support