Cleanup tmp directory upon exit.
Merge branch 'evangeline-lilly'