Update secretary-rails
Add new politics assets
Update politics assets
Disable CHR importing
Fix spec
Remove CHR importer
Merge remote-tracking branch 'origin/master' into db-sharding

Conflicts:
	Gemfile
	Gemfile.lock
Add replication lag protection to Outpost
Bundle update
spec updates for rspec 3.0 changes
Remove unnecessary require
Revert rspec-mock's Marshal monkey-patch