Fix the setup script a bit
Merge pull request #149 from whirm/venv_fix

Fix the setup script a bit