Merge pull request #197 from novacoin-project/revert-193-choosedatadir