Merge pull request #31 from magopian/master

refs #29: update conf.py again, with a version that should work