Merge pull request #64 from rdegges/develop

PyPi does keep timing out. I am going to merge this, give it some of my own tests, then add it to the next release schedule.
Replace the old virtualenv

This replaces the virtualenv setup with a more standardised setup, more
frequently seen in Python projects.
Accidental deletion
Merge pull request #66 from rdegges/venv_replacement

Replace the old virtualenv