removed SOLR war and fixed vagrant inventory

removed SOLR war and fixed vagrant inventory
Merge branch 'master' into volunteer-portal-2

Conflicts:
	ansible/inventories/vagrant