Change default folders for .swp files
merge