Removed proxy settings, no longer needed as we set them globally on
servers
Merge branch 'master' of https://github.com/flazzarini/dotfiles