diff --git a/.gitignore b/.gitignore
index 1b725d22be..0025c27beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,65 @@
-.dirstamp
-.deps
-*.orig
-*.rej
-*~
+# Traditional Compilation File Stuff.
 *.o
-tests/*.err
-ffmpeg-*
-*.ncb
-*.suo
-*.tlog
-*.lastbuildstate
-*.unsuccessfulbuild
-*.log
-*.ipch
 *.obj
-*.app
-*.dep
-*.idb
-*.pdb
-*.exp
-*.dmg
-*.orig
-*.sdf
-*.opensdf
+
+# Text Editor Based Items
 ___*
+*~
+*.log
+*.sublime-project
+*.sublime-workspace
+*.old
+
+# Repository Files
+*.orig
+.git
 .hg
 .hgignore
 .hgtags
 .svn
 .cvsignore
-.DS_Store
 *.diff
 *.patch
-Thumbs.db
-GameData.smzip
-config.log
-config.status
+
+# Mac Programming Files
 *.pbxuser
-*.user
-*.mode1v3
+PBProject/build
+Xcode/build
+Xcode/*.xcodeproj/xcuserdata/
+*.xcodeproj/xcuserdata
+*.xcodeproj/project.xcworkspace
+*.xcscheme
+WorkspaceSettings.xcsettings
+UserInterfaceState.xcuserstate
+*.xccheckout
+contents.xcworkspacedata
+xcschememanagement.plist
+PBProject/Hardware.plist
+lib*_link.a
+
+# Mac General Files
+*.app
+*.dmg
+.DS_Store
+
+# Visual Studio
+*.pdb
+*.sdf
+*.opensdf
+*.suo
+
+# Windows General Files
+Thumbs.db
 *.exe
-*.vdi
+*.dll
+nsis_strings_temp.inc
+
+# Linux General Files
+.dirstamp
 Makefile
 stepmania
 Makefile.in
+config.status
 _build/*
 aclocal.m4
 autoconf/*
@@ -54,33 +70,22 @@ src/Makefile
 src/config.h
 src/config.h.in
 src/stamp-h1
-Docs/doxygen
-PBProject/build
-Xcode/build
-Xcode/*.xcodeproj/xcuserdata/
-*.xcodeproj/xcuserdata
-*.xcodeproj/project.xcworkspace
-src/build-*
-src/Release-*
-src/libtomcrypt/build-*
-src/libtomcrypt/Release-*
-src/libtomcrypt/Debug
-src/libtommath/build-*
-src/libtommath/Release-*
-src/libtommath/Debug
-src/*.old
-*/.deps
-*/.dirstamp
-src/*.a
-src/*.so
 GtkModule.so
+
+# StepMania Specific
+*.smzip
 ver.cpp
-lib*_link.a
+Cache/
+Save/
+Logs/
+Songs/*
+Screenshots/
+portable.ini
+Docs/doxygen
 Data/UserPrefs
 Data/uPrefs
 Data/GamePrefs/*.cfg
 Data/Static.ini
-PBProject/Hardware.plist
 Themes/pump
 Themes/pump-*
 Themes/optical-release
@@ -89,35 +94,6 @@ Themes/ultralight
 Themes/test
 src/version.bin
 src/verstub.cpp
-Songs/*
-*.dmg
-.git
-*.smzip
-nsis_strings_temp.inc
-Data/SpeedMods.txt
-Program/StepMania*.lib
-crashinfo.txt
-Utils/temp*
-*.lnk
-BuildLog.htm
-*.pch
-Cache/
-Save/
-Logs/
-Screenshots/
-portable.ini
-*.sublime-project
-*.sublime-workspace
-*.xcscheme
-WorkspaceSettings.xcsettings
-UserInterfaceState.xcuserstate
-*.xccheckout
-contents.xcworkspacedata
-xcschememanagement.plist
-*.swp
-*.pc
-*.dll
-*.d
 bundle/ffmpeg/.config
 bundle/ffmpeg/.version
 bundle/ffmpeg/config.*
@@ -131,3 +107,40 @@ bundle/ffmpeg/*/*.def
 bundle/ffmpeg/*/*.orig.def
 bundle/ffmpeg/*/*.dll.a
 bundle/ffmpeg/*/*.lib
+src/build-*
+src/Release-*
+src/libtomcrypt/build-*
+src/libtomcrypt/Release-*
+src/libtomcrypt/Debug
+src/libtommath/build-*
+src/libtommath/Release-*
+src/libtommath/Debug
+src/*.a
+src/*.so
+ffmpeg-*
+Data/SpeedMods.txt
+crashinfo.txt
+Utils/temp*
+Program/StepMania*.lib
+
+# Unknown File Types
+.deps
+*.rej
+tests/*.err
+*.ncb
+*.tlog
+*.lastbuildstate
+*.unsuccessfulbuild
+*.ipch
+*.dep
+*.idb
+*.exp
+*.user
+*.mode1v3
+*.vdi
+*.lnk
+BuildLog.htm
+*.pch
+*.swp
+*.pc
+*.d