This should handle the SIGINTs a little better
Merge branch 'master' of github.com:justingood/terribot