Cleaning up and updating .gitignore