Merge pull request #52 from jblowe/master

NORJIRA: incremental improvements to solr datasource stuff
UCBG-345: excluded deleted vouchers
Merge pull request #53 from jblowe/master

UCBG-345: excluded deleted vouchers
Merge remote-tracking branch 'upstream/master'