Fixes #9. Fixes #14.

[ghost]

No description provided.

[ghost]

So, it looks like we're back to square one with continuous integration.

[jgonggrijp]

No worries, this time I'm going to accept your pull request. :-)

Before I do so, though: would you mind pushing another commit which adds pip to the dependencies in setup.py? Since we have been relying on pip for a long time, now is a good opportunity to make the dependency explicit.

[jgonggrijp]

That's three fixes in one go. Thanks a lot!