Merge SOLR into master

Added command line option for specifying SOLR config params.