diff --git a/.gitignore b/.gitignore
index 2c038baf..a3c65e2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,67 +1,13 @@
-# Python #
-##########
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
 
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
+# Compiled source #
+###################
+*.pyc
+*.py~
+*.pyproj
+*.sln
 
 # Headphones files #
-####################
+######################
 *.log
 *.db*
 *.db-journal
@@ -76,68 +22,16 @@ cache/*
 *.key
 *.csr
 
-# Windows #
-##########
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# OS X #
-########
+# OS generated files #
+######################
+.DS_Store?
 .DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Linux #
-#########
-*~
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
+ehthumbs.db
+Icon?
+Thumbs.db
 
 #Ignore files generated by PyCharm
-.idea/
-*.iml
+.idea/*
 
 #Ignore files generated by vi
 *.swp
@@ -159,6 +53,7 @@ Temporary Items
 *.bak
 *.cache
 *.ilk
+*.log
 [Bb]in
 [Dd]ebug*/
 *.lib