correctly catch bad merge output
Merge branch 'master' of github.com:jackwasey/jwutil
style