Enable the use of a configuration file
Added HTTP proxy support
Merged master
Either use config file or command line, but not both