checking in before upstream master merge
Merge branch 'master' of https://github.com/railsforcharity/spokenvote into proposal-editable-feb4
delete proposal now working
add code to confirm proposal is still editable or deletable
Merge pull request #75 from Vibhuti/master

Scoping the vote creation to the current user
fix merge conflicts
fix some odd typos
Merge remote-tracking branch 'upstream/master'
Merge pull request #78 from billsaysthis/proposal-editable-feb4

Proposal: Edit, Delete
Merge pull request #81 from Vibhuti/master

Enabling forgot password link.
fix display of new support after voting when new vote is the only vote
fix positioning of supports for all/any number of votes, correct number of branches on proposal table
Merge pull request #82 from billsaysthis/after-proposal-voting-fix-feb5

After proposal voting fix feb5
Merge remote-tracking branch 'upstream/master'