Use rspec 3 syntax
Remove country validation
Merge branch 'remove-country-validation'