Merge/ fixed up gitignore

.gitignore

@@ -1,25 +1,13 @@
-obj/
+# Python (Bytecode)
-bin/
-dev*
-lib/
-
-sol/include/
-
-# Ninja
-*.ninja
-
-# Benchmarking
-bench/
-
-# Lua
-lua-*/
-luajit-*/
-liblua.*
-
-# Python
 *.pyc
 
+# ninja files
+*.ninja
+
 # Visual Studio
+*.props
+*.user
+.vs/
 Debug/
 Release/
 x64/
@@ -30,16 +18,38 @@ x64/
 *.idb
 *.sln
 *.gitattributes
-desktop.ini
-.vs/
 
-include/
+# Compiler outputs
+obj/*
+bin/*
+
+# Dropbox interference
+.dropbox*
+
+# QtCreator
+*.creator.user.*
 *.config
 *.creator
 *.files
 *.includes
-*.ninja
+
-*.user
+# Scratchpad Files
-.dropbox*
+main2.cpp
-*.creator.user.*
+main.cpp
-*.props
+
+# Local Lua Testbeds
+lua-5.3.2/
+lua-5.3.1/
+lua-5.3.0/
+lua-5.2.4/
+lua-5.2.2/
+lua-5.2.3/
+lua-5.1.5/
+luajit-2.0.4/
+luajit-2.0.3/
+include/
+liblua.a
+lib/liblua5.2.a
+
+# Windows Crap
+desktop.ini