Don't show wallet options in the preferences menu when running with -disablewallet
Merge branch 'master' of https://github.com/sinetek/bitcoin