updated gitignore and settings