Update countries.xml
Update opt-countries.xml
Merge pull request #206 from hvdwolf/master

Update countries and opt-countries; move mexico