Use the correct dir to cleanup. Lift incoming_dir out into a local variable.
Merge pull request #202 from haus/master

Use the correct dir to cleanup. Lift incoming_dir out into a local varia...