slight modifications and shortening of things
added ctrl+c exception handling for clean exit
Merge pull request #1 from kevr/testing

Bam diggity!