Fixup version/release strings

Both in setup.py and docs/conf.py