Cleanup plus adding .swp to gitignore list