Clean up "raise"s (PEP 352).
2to3 changes run from 3.4.1
bytes to string decode
attempted merge
Exceptions in correct format, merge