Clean up Git metadata

.gitattributes

@@ -1,22 +1,13 @@
-# Auto detect text files and perform LF normalization
+* text=auto encoding=utf-8
-* text=auto
 
-# Custom for Visual Studio
+*.html     diff=html
-*.cs     diff=csharp
+*.php      diff=php
-*.sln    merge=union
+*.bat      eol=crlf
-*.csproj merge=union
+.gitignore -eol
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
 
-# Standard to msysgit
+
-*.doc     diff=astextplain
+tests/         export-ignore
-*.DOC     diff=astextplain
+.*             export-ignore
-*.docx diff=astextplain
+build.xml      export-ignore
-*.DOCX diff=astextplain
+composer.*     export-ignore
-*.dot  diff=astextplain
+phpdoc.*       export-ignore
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF     diff=astextplain
-*.rtf     diff=astextplain
-*.RTF     diff=astextplain

.gitignore

@@ -1,48 +1,45 @@
-#dependencies
-vendor/
 
-#temp files
+# Temporary files and dependencies
+
+vendor/
 documentation/
-tests/coverage
+tests/coverage/
+build/
 arsse.db*
 config.php
 .php_cs.cache
-build
 
-# Windows image file caches
+
+
+
+# Windows files
+
 Thumbs.db
 ehthumbs.db
-
-# Folder config file
 Desktop.ini
-
-# Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# =========================
-# Operating System Files
-# =========================
 
-# OSX
+# macOS files
-# =========================
 
 .DS_Store
 .AppleDouble
 .LSOverride
-
-# Icon must ends with two \r.
 Icon
-
-
-# Thumbnails
 ._*
-
-# Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
+# archives
+
+*.zip
+*.7z
+*.tar.gz
+*.tgz
+*.deb
+*.rpm
+*.dmg
+*.cab
+*.msi
+*.msm
+*.msp