Merge branch 'master' of https://github.com/NSkelsey/puppet-solr into vagrant-dev

Conflicts:
	Vagrantfile
	files/solr.xml
	manifests/core.pp
	manifests/jetty.pp
	manifests/tomcat6.pp
lets see what happened