Clean up indentation

Follow the convention of one indentation level per enclosed class
or module.
Merge pull request #17 from jvirtanen/cleanups/indentation

Clean up indentation