Okay, I just fixed about 30 instances of mis-alignment. @agramfort needs to work on his PEP8 indentation skills :)