touchlist updates from chapstick master
Revert "touchlist updates from chapstick master"

This reverts commit 596f40b4e6b769064935191f4e37a85708c4e5b9.
Merge branch 'master' of https://github.com/meetup/sassquatch