Clean up some boolean logic
Merge branch 'master' of github.com:batedurgonnadie/salty_bot