Added order by clauses to the mappesr so addresses come out sorted by th...

...e country name rather than country code and country name then province name for provinces. Makes more sense to have them ordered this way for display purposes.