added units package to setup.py
fixed docstring
fixed conflict in setup.py