add city and state ideal columns
merge schema.rb