Merge branch 'display-version-in-help' of https://github.com/mhanne/bitcoin