WIP testing.
Merge remote-tracking branch 'origin/test_setup' into test_setup

Conflicts:
	spec/features/faceted_nav_spec.rb