X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/4e41e4ab171d4d47cdac0f8676bf78d36e6eb007..0283f11b7fec9fcfb81093f9458e759ee7f91707:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 82c7466..32d313b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -59,17 +59,17 @@ end
 
 # 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