added --debug option, removed janky  options everywhere
Merge pull request #85 from jdan/debug

Debugging option