Merge branch 'master' of github.com:iloveponies/i-am-a-horse-in-the-land-of-booleans