Accept socket_timeout_ms. Alphabetize valid options
Merge pull request #70 from bpot/ah/fix_valid_options

Accept socket_timeout_ms. Alphabetize valid options