fixed the search features and got database_cleaner doing its thing
Merge branch 'master' of https://github.com/offmango/spotxm

Conflicts:
	db/sphinx/test/track_core.spa
	db/sphinx/test/track_core.spd
	db/sphinx/test/track_core.sph
	db/sphinx/test/track_core.spi
	db/sphinx/test/track_core.sps
	features/support/sphinx.rb
	log/searchd.development.pid
	log/searchd.test.pid