Travis: Also test on Ruby 2.1.0.
Merge remote-tracking branch 'origin/v1.x'
Merge remote-tracking branch 'origin/master' into coop
Update capybara.
Update docile.
Update multi_json.
Update Bundler to 1.5.2.
Update childprocess.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock
Automatic schema update.
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
Ensure 'explanation' paragraphs are styled wherever they occur.
Add JS for a generic 'click-to-show' UI.
Fix that links in 'explanation' paragraphs were unstyled.
Coop: Add examples for how to fill in the 'Objects' field correctly.
Merge branch 'coop-release' into oneclick-uk-coop