Build version - fixes #297 (partially)

This includes the another pull request.  This is more for the second commit.