Adds better model unicode for python 3

Used the python_2_unicode_compatible decorator to support "unicode/str" in both
python 2 and 3.
Merge branch 'fix-15'
TODO update