Merge in changes to ignore file.
Make file same as master.