Whitespace cleanup

Reflowed some indents to reduce enormous indents
Fixed some outright wrong indents
Reordered keyword args in forms to be consistent
Fixed dict whitespace
Merge pull request #340 from dsnellgrove/pep8-1

Whitespace cleanup