Setup

Cleans up the setup.py etc. (I hope removing the zip part is ok), it appears to be zip safe with `python setup.py sdist --format=zip`.

Also fixes a couple of flaky test failures (I guess the result of some of the web calls changed since previous PRs were made).