Merge from Justin

Fix runtime errors in RubyVote introduced.

diff --cc app/views/quickvote/results.rhtml
Simple merge

diff --cc lib/rubyvote/election.rb
index 42f18bb6c9fa7470e34c46051787573b377fdce2,efb8dd8aae1ce56abc9896853a32eaf5c0f562da..ffd31c846e56400e9df945361d5a4c11ebb9df9d
--- 1/lib/rubyvote/election.rb
--- 2/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@@ -151,6 -152,8 +152,8 @@@ class PluralityResult < ElectionResul
        b[1] <=> a[1]
      end.collect {|a| a[0]}
      
 -    @points = self.election.votes
++    @points = @election.votes
+     
      # winners are anyone who has the same number of votes as the
      # first person
      @winners = @ranked_candidates.find_all do |i|

diff --cc lib/rubyvote/positional.rb
index 3de3fb29ae6f20b0371eedacb41471ff73be279f,dc0b63aca3811bdb07e2fdcfb4f4107d5d53b0d3..056194b519dc88f2a79adc3617bf95f250fa3310
--- 1/lib/rubyvote/positional.rb
--- 2/lib/rubyvote/positional.rb
+++ b/lib/rubyvote/positional.rb
@@@ -76,6 -77,8 +77,8 @@@ class BordaResult < ElectionResul
      @winners = @ranked_candidates.find_all do |i|
        votes[i] == votes[@ranked_candidates[0]]
      end
 -    @points = self.election.votes
+     
++    @points = @election.votes
    end
  
  end