Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
Should we add a new status type? it seems TIMEOUT is not exactly appropriate, although the text description of the error would match.