Easy pickings: PEP8 cleanups, quoting style, unused imports
More code cleanups
Merge remote-tracking branch 'origin/master'