Add .netrwhist to .gitignore

Don't know where it came from...
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Remove setup-auth-sock

I don't think that approach is going to work...