Add actionOnException and actionFinally, including docs and tests
Makefile, delete a redundant import