Modified setup.py so that users only need to install once now!