Drupal 9 compatibility and some bug fixes

.gitignore

@@ -1,10 +1,22 @@
-# folders and files to be ignored by git
+# Composer
+/vendor/
+composer.lock
 
-############
-## OSes
-############
+# Editors
+project.xml
+project.properties
+/nbproject/private/
+.buildpath
+.project
+.settings*
+.idea
+.vscode
+*.sublime-project
+*.sublime-workspace
+.sublimelinterrc
 
-[Tt]humbs.db
-[Dd]esktop.ini
-*.DS_store
-.DS_store?
+# OS X metadata
+.DS_Store
+
+# Windows junk
+Thumbs.db