This doesn't completely fix #116, but it makes setting up a cron job to do cleanup much more pleasant.