updating solr
updating ignore
fixing config files
Merge branch 'master' of https://github.com/teknofire/ruby_reader

Conflicts:
	.gitignore