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

This reverts commit 335b5756a40d80e55e4babcccce2751d667ce6b9.
Revert "Merge branch 'master' of https://github.com/sndrs/sndrs"

This reverts commit ae15c656477ecc569d1f9bdf5eb38816979b3696, reversing
changes made to b02b7809a90d3905e25278f4752cb8449928f640.
clear out master