first pass at better version name
Merge branch 'version_from_git' into devel