Support unicode tokens in a Python 2 and 3 compatible way. Fixes #17
Merge branch 'unicode_support'

Add token support for unicode