Updated settings and gitignore files