Python3 Updates

I had to make two changes to str vs. bytes with six in order to get
github to work.