story_207: implemented the fixes referenced in the story
story_207: implemented the fixes referenced in the story
Merge branch 'story-207-nick' into release-2014-11-14

Conflicts:
	app/controllers/quote_requests_controller.rb
	app/views/quote_requests/index.html.erb
	spec/features/quotes_spec.rb
story_207: implemented the fixes referenced in the story