Update version number.
Update conf.py for new version.
Merge conflict.
Update version.