Fixing gitignore and untracked files