Todd's butts
Merge branch 'master' of github.com:thethp/registry.butts into thethp-master
update to new format
Merge branch 'thethp-master'