Addressed most feedback from code review #1:

* Introduced socksAuthCredentials as config variable
* kill socksAuthMethod
* simplified long conditionals
* truncated long lines