Merge pull request #21 from lararennie/master

Rearranging Ecuador postal codes.
Merge pull request #22 from lararennie/master

Fixing Java unit-test that fails now that the server data has been updated.
Merge remote-tracking branch 'upstream/master'