added .netrwhist
removed old servers; added encryption and compression
moved swap files to ~/.vim/swap//
merged origin conflicts