Updating branch to include packaging for Apache Solr
Updating solr to 4.x
Merge branch 'master' into solr

Conflicts:
	provision.sh
Merge remote-tracking branch 'origin' into solr

Conflicts:
	provision.sh
Updating provision to complete solr installation