Added debug option to argv
Removed old TODO comment (done). Added opts.debug check to squelch debug messages
Merge branch 'develop' of github.com:ninjablocks/client into develop