order command line options, add disting proxy option group
remove debug switch
forward proxy -> upstream proxy
Merge pull request #239 from mitmproxy/options_cleanup

Options cleanup