Added scipy as a dependency to setup.py
Minor cleanup.