Added a few more files to ignore

This should help fix a few errors with merging