Allow specification of alternate settings dir via BITMESSAGE_HOME
resolve merge conflict