Updates to gitignore

Attempting to ignore certain files to prevent merge conflicts