Fixes for pep8 E111 and E121.

Whitespace fixes to satisify pep8.

To review this, it may be useful to use a side-by-side diff tool, such as git difftool with vimdiff.

Please see http://www.python.org/dev/peps/pep-0008/ for reference to the style guide.