Fix silly cases where the 'version' at build-time wasn't made properly.
Merge pull request #860 from jordansissel/fix-version-building

Fix silly cases where the 'version' at build-time wasn't made properly.