Stepping some things back to revert to the old catalog, so I can fix the importers and solr
Merge branch 'master' of github.com:PerseusDL/perseus_catalog

Conflicts:
	app/builders/cite_colls.rb

Merge and commenting out of rolled back schema items