Updates for running in Solr 4.6
Updates for 'collection1' for Solr 4.5+
Updates for Solr 4.6 on Tomcat 7 in OS X