added solr info
Merge branch 'master' of https://github.com/mk270/openspending-installer

Conflicts:
	install
break out into function