Remove ~ files and change gitignore