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
fix merge conflicts
fix some odd typos
Merge pull request #78 from billsaysthis/proposal-editable-feb4

Proposal: Edit, Delete