Merge branch 'fix-921'

This is #921 without the addition of editor-specific rules.

PlayFramework.gitignore

@@ -1,19 +1,17 @@
 # Ignore Play! working directory #
-bin
-db
-eclipse
-lib
-log
-logs
-modules
-precompiled
-project/project
-project/target
-target
-tmp
+bin/
+/db
+.eclipse
+/lib/
+/logs/
+/modules
+/project/project
+/project/target
+/target
+tmp/
 test-result
 server.pid
 *.iml
 *.eml
-dist
+/dist/
 .cache