Update to Weighted Search. Pushing to Branch due to unresolved issues.
Updated weighted search to be usable.
Actually usable now. Apologies.
Merge branches 'master' and 'weighted_search'

Resolved conflicts:
	settings.php