make python3 compatible
Merge pull request #27 from gtmanfred/master

Make changes to be python3 compatible again
Merge remote-tracking branch 'salt/master'