Update conf.py
Updated twython-django submodule [ci skip]
Trying to fix conflicts