Update .gitignore

Remove leftover merge conflict markers
Consolidate duplicate entries

Author: santaimpersonator

.gitignore

@@ -19,8 +19,6 @@
 ## BOM files
 *bom*
 
-## VSCode directories
-.vscode
 
 #################
 ## Eclipse
@@ -77,22 +75,50 @@ local.properties
 #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
 #################
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+## VSCode directories
+.vscode
+
 # User-specific files
 *.suo
 *.user
@@ -196,16 +222,6 @@ $RECYCLE.BIN/
 *.msm
 *.msp
 
-#############
-## Mac OS
-#############
-
-.DS_Store
-
-# OSX
-# ===========
-.AppleDouble
-.LSOverride
 
 #############
 ## Linux
@@ -216,43 +232,36 @@ $RECYCLE.BIN/
 
 
 #############
-## Python
+## Mac OS
 #############
 
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Icon must ends with two \r.
-Icon
-
 # 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
-
-#Mr Developer
-.mr.developer.cfg