cleanup
Merge pull request #492 from ambiata/topic/clean

Cleaning up temporary locations