Don't let conflicts prevent mempool acceptance of disconnected txs
Merge pull request #133 from aalness/fix_reorg_conflict

Don't let conflicts prevent mempool acceptance of disconnected txs