Merge pull request #62 from methane/modernize

Run modernize over the codebase (work toward Python 3).