first pass at better version name
Merge remote-tracking branch 'devel/version_from_git'