Improved error catching
Merge branch 'master' into feature-autocorrect

Conflicts:
	app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
Added 'powered by Solarium' message to description of Catalog Search Index
Merge branch 'master' into feature-autocorrect