Moved swap/ --> swp/, updated gitignore