Stale references

This merges `upstream/v0.2.0` into your branch and gets rid of the last two stale references. Hopefully this'll make Travis happier :grin: