Fixed E125 pep8 warnings

You can reproduce this patch by typing:
```    
autopep8 -i --select=E125 `find . -name "*.py"`
```
You need the master version of `autopep8` -- there is a new patch for reindentation.