Minor fixes
Merge branch 'master' of https://github.com/ekansa/open-context-py
Merges database updates with most recent Solr indexing code