Merge pull request #8 from mredar/master

pulling in Mark's solr changes
Merge remote-tracking branch 'upstream/master'