When a Proposal is destroyed, destroy associated Votes. Closes #467.
Merge remote-tracking branch 'origin/v1.x'
Fix spec.
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	app/models/proposal.rb
	spec/support/blueprints.rb