Updated .gitignore to be a bit better, and remove a file that the Gradle IntelliJ plugin adds
Merge remote-tracking branch 'origin/1.6.2' into 1.6.2