Fixes for pep8 E111 and E121.
Merge pull request #241 from fintler/indentation_multiple_four_compose

Fixes for pep8 E111 and E121.