pep8: format indentation from 2 spaces to 4

Changed 2 space indentation to 4 spaces because most python editors default to this standard.  A few small pep8 fixes.