Convert all tabs to 4 spaces, and other minor PEP8 fixes.
All PEP8 tests should pass now.

Change-Id: I809435155799c089e1103962e1aa8b86026cf509