Allow specification of alternate settings dir via BITMESSAGE_HOME
resolve merge conflict
Merge pull request #462 from Atheros1/master

Allow specification of alternate settings dir via BITMESSAGE_HOME