remove changes to gitignore.
remove remaining differences from 7.x