Updated README and committed conf.py changes that should have been in last commit.