Make version number convention work better with git.

Version number should now be incremented each time you change the source code in
the git repository. Release number is only incremented when you change the
Makefile without changing the underlying source code.