Log if we're proxying. Apparently, python 2 can throw OSError when there's actually been an IOError.
Windows has no fcntl
Merge master. Fix conflict.
Merge branch 'master' of github.com:Floobits/floobits-sublime