add in general usa here too (bug 836865)
Merge pull request #56 from andymckay/836865

add in general usa here too (bug 836865)
fix the cancel button (bug 837979 and bug 837913)