Update politics assets
Disable CHR importing
Fix spec
Remove CHR importer
Temporary cache 44167
spec updates for rspec 3.0 changes
Remove unnecessary require
Revert rspec-mock's Marshal monkey-patch
Revert "Temporary cache 44167"

This reverts commit 4a3391c08c1fe5cc17af5e8845519d4f4d9c482e.
Remove old comment
Revert "Revert rspec-mock's Marshal monkey-patch"

This reverts commit 10af6a7c1c4f52b7408cba51e1fb97f7d9c04d07.

Conflicts:
	spec/spec_helper.rb
Remove hard DB limit on slugs
Merge remote-tracking branch 'origin/master' into categories-updates

Conflicts:
	db/schema.rb