undo duh
Merge branch 'master' of github.com:zengargoyle/selfcontrol
duh