Merge branch 'updates-for-2021-guidance'

Update default main branch

Update version for testing

Its ugly to have pypi versions just for testing, but I can't find
another easy way to test this.

Bump version

Bump version