Ignore .shelf directory
This directory is used by Intellij for shelved
files.
Also simplified the .gitignore file by removing
duplicate entries.
Closes from HappyRay/ignore-shelf-dir
.classpath*
.project*
.settings
-.idea
-*.iml
-*.iws
-*.ipr
-*.swp
-*.swo
-*.log
-**/.classpath
-**/.project
-**/.settings
+
+# Intellij related
**/.idea
**/*.iml
**/*.iws
**/*.ipr
+.shelf/
+
+**/.classpath
+**/.project
+**/.settings
+
**/*.swp
**/*.swo
**/*.log
*/bin
**/bin
-build/
**/build/
.gradle
**/.gradle
