Simpler messaging and bitmessage configs
Merge branch 'master' into dudu