Adding yahoo search
Merge remote-tracking branch 'origin' into new-search

Conflicts:
	content.js
Added this
Adding some things