Revert "Revert "Add support for stopping a proxier.""

This reverts commit 19beaf71b576b557f65960ec35086b9580a91221.
Fixed tests.
Add a comment to tickle travis.
Merge pull request #706 from brendandburns/proxy

Revert the revert and fix tests.