More touchup in map pair generation while thinking about mash storage

rails/map-mash/app/models/map.rb

@@ -2,31 +2,18 @@ require 'fastercsv'
 
 
 class Map < ActiveRecord::Base
-  named_scope :lowest_scoring, :conditions => [
-      %{`maps`.`points` = (
-          SELECT `points` FROM `maps`
-          ORDER BY `points` ASC
-          LIMIT 1
-      )}]
-
   def self.from_city_name(city_name)
     self.find_or_initialize_by_name(city_name).save!
   end
 
   def self.pair
-    if Mash.count == 0
+    self.all(:order => 'RANDOM()', :limit => 2)
-      self.all(:order => 'RANDOM()', :limit => 2)
-    else
-      self.lowest_scoring.all(:order => 'RANDOM()', :limit => 2)
-    end
   end
 
   def self.import(csv_filename)
     FasterCSV.parse(open(csv_filename), :headers => true,
         :header_converters => [:downcase, :symbol]).each do |row|
-      map = self.find_or_initialize_by_name(
+      map = self.find_or_initialize_by_name("#{row[:city]}, #{row[:region]}")
-        "#{row[:city]}, #{row[:region]}"
-      )
       map.save
       if block_given?
         yield map