Merge pull request #56 from andymckay/836865

add in general usa here too (bug 836865)
notify after x failures (bug 797927)