Update .gitignore

Trying to update .gitignore so that we don't have project-specific conflicts :(