Update .gitignore

Fixing .gitignore again... The merge added the JetBrains specific stuff back in.