Update .gitignore

Remove leftover merge conflict markers
Consolidate duplicate entries
Remove ignored file type

Author: santaimpersonator

.gitignore

@@ -2,10 +2,6 @@
 ## SparkFun Useful stuff
 #################
 
-Firmware/GNSSDO_Firmware/build/
-
-*backups*
-
 ## AVR Development
 *.eep
 *.elf
@@ -23,8 +19,6 @@ Firmware/GNSSDO_Firmware/build/
 ## BOM files
 *bom*
 
-## VSCode directories
-.vscode
 
 #################
 ## Eclipse
@@ -78,6 +72,42 @@ local.properties
 *.gbr
 *.drl
 
+#KiCad Backup files
+*.kicad_prl
+fp-info-cache
+sym-lib-table
+~*.lck
+*-bak
+*-backups
+*-cache*
+*-bak*
+*.bak
+_autosave*
+\#auto_saved_files\#
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Virtual Environments
+venv/
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
 
 #################
 ## Visual Studio
@@ -86,6 +116,9 @@ local.properties
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+## VSCode directories
+.vscode
+
 # User-specific files
 *.suo
 *.user
@@ -165,22 +198,29 @@ Backup*/
 UpgradeLog*.XML
 
 
+# =========================
+# Operating System Files
+# =========================
+
 ############
 ## Windows
 ############
 
 # Windows image file caches
 Thumbs.db
+ehthumbs.db
 
 # Folder config file
 Desktop.ini
 
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
 
-#############
-## Mac OS
-#############
-
-.DS_Store
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
 
 
 #############
@@ -192,33 +232,36 @@ Desktop.ini
 
 
 #############
-## Python
+## Mac OS
 #############
 
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-#build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
 # Installer logs
 pip-log.txt
 
 # Unit test / coverage reports
 .coverage
 .tox
 
+# Icon must ends with two \r.
+Icon
+
+# Thumbnails
+._*
+
 #Translations
 *.mo
 
 #Mr Developer
 .mr.developer.cfg
+
+# Mac crap
+.DS_Store
+
+# OSX
+# ===========
+.AppleDouble
+.LSOverride
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes