Merge pull request #385 from fantix/renamings

Refs #38, fixed renamed symbols in PY3
Replace obvious unicode() with text_type.