Updated conf file
Merge branch 'master' of https://github.com/travisfischer-cars/sphinx-research