Started working on CLI tests.
Added ignore incase the dummy leak script ever lingered.
Updated options parsing.
Added tests for cli.
Merged from master.
Spacing and some logic cleanup.
Changed test so it was unique.
Merge pull request #133 from arb/cli-tests

Cli tests