Bug 1022578 - In-content: Use border instead of box-shadow on categories and tabs. r=jaws

--HG--
extra : rebase_source : bbe1534f056b444e7dd6d0f9130591c9b25f0d05
Bug 1088050 - Add a pref to disable search for single-word hosts. r=smaug

--HG--
extra : rebase_source : 129691497ef6fe5b7168391ec08097eb9b22bc3c