Remove country_code & country_name for now
Switch to sequel
Merge branch 'master' into production