merging in .gitignore fixes