# Include your application configuration below
-MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
+MAIL_CONFIG = { :from => 'Selectricity <team@selectricity.org>'}
require 'uniq_token'
require 'randarray'
require 'gruff-0.2.8/lib/gruff'
require 'sparklines'
require 'rubyvote'
-ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
- 'plurality' => "Plurality/First Past the Post",
- 'approval' => "Approval (Top Two)",
- 'condorcet' => "Simple Condorcet",
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+ 'plurality' => "Plurality",
+ 'approval' => "Approval",
+ 'condorcet' => "Condorcet",
'borda' => "Borda Count"}
class String