Make sure that char* type functions produce 'str' output on Python 2.
Nits: move declaration to top of method; rename var.
Fix docstring tests.
Merge pull request #40 from mdickinson/fix/string-output

Make sure that char* type functions produce 'str' output on Python 2.
Merge remote-tracking branch 'origin/master' into pyflakes