Heroku fix for country
Moved gemfile order
Trial and error with Heroku country select gem
Merge fix & Heroku updates