Added options, including --verbose, --restart
removed --debug option
Merge branch 'master' of github.com:technoleptic/oddments