Modified country_select to permit passing :object as an option.