Added version string generated with git describe
Fixed version.py to work correctly in case of error
Merge branch 'master' into async-flowctl