Bug 1102204 - Update search provider rendering r=kgrandon

Conflicts:
	apps/search/js/providers/provider.js
	apps/search/test/marionette/browser_test.js