cleanup dependencies
sort dependencies
pep8 setup.py
test fixes pt.1