Made the keys section of settings_load more readable in settings.c
Merge branch 'jdp5087-tour'
add HTTP proxy support
update man page