Don't fiddle with the "vsn", or try clever tricks with version control to generate it.  Fixes #471.
Merge branch 'fix_vsn'