do more cleanup on ctrl+c
Merge pull request #124 from mcellis33/ctrlc

do more cleanup on ctrl+c