remove sunspot.yml from git and add an example conf file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore