Merge head

diff --cc app/models/election.rb
Simple merge

diff --cc config/environment.rb
index 2a7700951185f8eb71204f1210948ed156ec81a3,5ea9f103de256e61f44349285a358559b2b3a11c..fcabdd87aa6279b6003532259625536ac62e3fb3
--- 1/config/environment.rb
--- 2/config/environment.rb
+++ b/config/environment.rb
@@@ -63,10 -63,15 +63,14 @@@ MAIL_CONFIG = { :from => 'Selectricity 
  
  require 'uniq_token'
  require 'randarray'
- require 'gruff'
+ require 'gruff-0.2.8/lib/gruff'
  require 'sparklines'
 -
  require 'rubyvote'
- ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+ ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
+                   'plurality' => "Plurality/First Past the Post",
+                   'approval' => "Approval (Top Two)",
+                   'condorcet' => "Simple Condorcet",
+                   'borda' => "Borda Count"}
  
  class String
    # alternate capitalization method that does not lowercase the rest of