Removed sunspot config
Merge branch 'master' of heroku.com:journey-journal

Conflicts:
	config/sunspot.yml