Revert "Merge branch 'master' of https://github.com/cassidylaidlaw/peacetalk"

This reverts commit 9f4e1120c8e3c4ac707b4740511265728c9b88ab, reversing
changes made to b2c9ac685d9bf27978f8066bd3ddd1ca57ba72f8.