Merge pull request #13 from TheBlueMatt/2018-03-htlc-failures