cleaning up .gitignore fumblings
merge conflicts