FF: previous commit introduced a syntax error in attributetools.py
BF: manifest (for zip files) should include tests/data/*.psyexp
PEP: None should be compared using `is` not `==`

also stripped a lot of whitespace