Updating docs
Merge in latest changes from master
Add specs for #proxy
Add proper handling of alone proxy password in the config