Fix FILEVERSION

Merge in changes that fix FILEVERSION.  This fixes #25.