optionsmodel cleanup

• cleanup optionsmodel before adding new proxy options
• place SOCKS version stuff below proxy port (IP, Port, SOCKS version)
• simplyfy some parts of the code (e.g. don't check IP and port, as this is done in optionsdialog anyway, remove unneeded {} in switch/case)
• small cosmetic changes in the header for better readability