Fixed 'make dist' so it will not include 'v' in the version number (ie. v1.0.0)
Merge branch 'master' into debian to get makefile changes