Added documentation to units, fixed stylistic errors, removed overly complex inheritance schemes
Merged, still need to resolve sets.py conflict
Fixed conflicts in sets.py with all tests passing