Add *~ to .gitignore, cleanup a few *~ files