Store region and carrier in a sensible way (bug 943539)
Merge pull request #321 from mozilla/sensible_regions

Store region and carrier in a sensible way (bug 943539)