Update versions, fix URLs
Merge branch 'master' into DOCS/update_versions_badge

Conflicts:
	docs/source/conf.py
Merge pull request #844 from StackStorm/DOCS/update_versions_badge

Update versions, fix URLs