Don't unicode() it if it's unicode
Merge branch 'master' of github.com:johntyree/rio