Adds support for overrides.json
merge branch 'master' of https://github.com/krdyke/OGP-metadata-py
Merge branch 'master' into solr