Update gitignore
Remove one more file.
Add in initial parsing and merging.