Updated gitignore to prevent stupid merges