Merge pull request #52 from jblowe/master

NORJIRA: incremental improvements to solr datasource stuff