Stringio using six and a few other phoenix changes

On two files quit a few whitespace changes sneaked in (forgot to reset my WingIDE config).

Just found this:
https://github.com/blog/967-github-secrets

- Add ?w=1 to the URL to see the diff with whitespace ignored when reviewing a commit