Fixes #71

Also fix the lint warnings in setup.py: consistent use of continued indentation and trailing commas.