added text editor specific entries
merge gitignore