merged in changes from live version

diff --cc app/controllers/graph_controller.rb
Simple merge

diff --cc app/views/voter/review.rhtml
index 425c952fff4099bd7a1b37ec26529bad85b44ea6,7ecaf5fb7a054d8647cd4360a2bc03d901d75bb3..b831aef225471db68e2181fd2c1b8a670bc202a5
--- 1/app/views/voter/review.rhtml
--- 2/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@@ -28,8 -28,9 +28,9 @@@ preferred to least preferred:</p
  
    <p>If you choose, you will be able to go back<br />and change it up until
    the end of the voting period.</p>
 -
++  
    <p><%= button_to 'Discard This Vote', votepassword_url(
 -                   :action => 'index', :urlpassword => @voter.password) %></p>
 +                   :action => 'index', :urlpassword => @password) %></p>
  
    <p>You will be returned to the voting page to vote<br /> again, if you choose.</p>