diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 6b0462f..9a0f862
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,21 @@
+# generic ignores
+*.la
+*.lo
+*.o
+*.deps
+*.libs
+gen-*
+*.suo
+*.cache
+*.user
+*.ipch
+*.sdf
+*.jar
+*.exe
+*.dll
+*_ReSharper*
+*.opensdf
+
 /Makefile
 /Makefile.in
 /aclocal/libtool.m4
@@ -8,12 +26,11 @@
 /aclocal.m4
 /autom4te.cache
 /autoscan.log
-/compiler/cpp/.deps
+/compiler/cpp/Debug
+/compiler/cpp/libparse.a
 /compiler/cpp/Makefile
 /compiler/cpp/Makefile.in
 /compiler/cpp/thrift
-/compiler/cpp/*.o
-/compiler/cpp/*.a
 /compiler/cpp/thriftl.cc
 /compiler/cpp/thrifty.cc
 /compiler/cpp/thrifty.h
@@ -30,16 +47,10 @@
 /contrib/fb303/config.log
 /contrib/fb303/config.status
 /contrib/fb303/configure
-/contrib/fb303/cpp/.deps/
-/contrib/fb303/cpp/FacebookBase.o
-/contrib/fb303/cpp/FacebookService.o
 /contrib/fb303/cpp/Makefile
 /contrib/fb303/cpp/Makefile.in
-/contrib/fb303/cpp/ServiceTracker.o
-/contrib/fb303/cpp/fb303_constants.o
-/contrib/fb303/cpp/fb303_types.o
-/contrib/fb303/cpp/gen-cpp/
 /contrib/fb303/cpp/libfb303.a
+/contrib/fb303/java/build/
 /contrib/fb303/py/Makefile
 /contrib/fb303/py/Makefile.in
 /contrib/fb303/py/build/
@@ -48,20 +59,17 @@
 /contrib/fb303/py/fb303/__init__.py
 /contrib/fb303/py/fb303/constants.py
 /contrib/fb303/py/fb303/ttypes.py
-/contrib/fb303/py/gen-py/
 /depcomp
 /if/Makefile
 /if/Makefile.in
 /install-sh
 /lib/Makefile
 /lib/Makefile.in
-/lib/cpp/.deps
-/lib/cpp/.libs
 /lib/cpp/Makefile
 /lib/cpp/Makefile.in
-/lib/cpp/test/.deps
-/lib/cpp/test/.libs
-/lib/cpp/test/gen-cpp
+/lib/cpp/Debug/
+/lib/cpp/Release/
+/lib/cpp/src/thrift/qt/moc_TQTcpServer.cpp
 /lib/cpp/test/Makefile
 /lib/cpp/test/Makefile.in
 /lib/cpp/test/Benchmark
@@ -78,39 +86,40 @@
 /lib/cpp/test/UnitTests
 /lib/cpp/test/ZlibTest
 /lib/cpp/test/tests.xml
-/lib/cpp/test/*.la
-/lib/cpp/test/*.lo
-/lib/cpp/test/*.o
 /lib/cpp/concurrency_test
-/lib/cpp/*.o
-/lib/cpp/*.la
-/lib/cpp/*.lo
 /lib/cpp/*.pc
-/lib/csharp/Thrift.dll
+/lib/cpp/x64/Debug/
+/lib/cpp/x64/Release
 /lib/c_glib/*.gcda
 /lib/c_glib/*.gcno
-/lib/c_glib/*.la
-/lib/c_glib/*.lo
 /lib/c_glib/*.loT
-/lib/c_glib/*.o
-/lib/c_glib/.deps
-/lib/c_glib/.libs
 /lib/c_glib/Makefile.in
 /lib/c_glib/Makefile
-/lib/c_glib/test/*.o
-/lib/c_glib/test/*.lo
 /lib/c_glib/test/testwrapper.sh
 /lib/c_glib/test/testwrapper-test*
-/lib/c_glib/test/.deps
-/lib/c_glib/test/.libs
-/lib/c_glib/test/gen-cpp/
-/lib/c_glib/test/gen-c_glib
 /lib/c_glib/test/Makefile
 /lib/c_glib/test/Makefile.in
+/lib/c_glib/test/testbinaryprotocol
+/lib/c_glib/test/testbufferedtransport
+/lib/c_glib/test/testdebugproto
+/lib/c_glib/test/testframedtransport
+/lib/c_glib/test/testmemorybuffer
+/lib/c_glib/test/testoptionalrequired
+/lib/c_glib/test/testsimpleserver
+/lib/c_glib/test/teststruct
+/lib/c_glib/test/testthrifttest
+/lib/c_glib/test/testthrifttestclient
+/lib/c_glib/test/testtransportsocket
 /lib/c_glib/thriftc.pc
 /lib/c_glib/thrift_c_glib.pc
 /lib/csharp/Makefile
 /lib/csharp/Makefile.in
+/lib/csharp/src/bin/
+/lib/csharp/src/obj/
+/lib/d/Makefile
+/lib/d/Makefile.in
+/lib/d/test/Makefile
+/lib/d/test/Makefile.in
 /lib/erl/.generated
 /lib/erl/.eunit
 /lib/erl/ebin
@@ -125,15 +134,9 @@
 /lib/java/Makefile
 /lib/java/Makefile.in
 /lib/java/build
-/lib/java/gen-java
-/lib/java/gen-javabean
-/lib/java/libthrift.jar
 /lib/js/test/build
-/lib/js/test/jstest.jar
-/lib/js/test/gen-*
 /lib/js/test/Makefile
 /lib/js/test/Makefile.in
-/lib/nodejs/examples/gen-*
 /lib/perl/MANIFEST
 /lib/perl/Makefile
 /lib/perl/Makefile.in
@@ -142,28 +145,22 @@
 /lib/perl/pm_to_blib
 /lib/perl/test/Makefile
 /lib/perl/test/Makefile.in
-/lib/perl/test/gen-perl
 /lib/py/Makefile
 /lib/py/Makefile.in
 /lib/py/build
 /lib/rb/Makefile
 /lib/rb/Makefile.in
-/lib/rb/benchmark/gen-*
 /lib/rb/debug_proto_test
 /lib/rb/.config
 /lib/rb/ext/Makefile
-/lib/rb/ext/*.o
 /lib/rb/ext/conftest.dSYM/
 /lib/rb/ext/mkmf.log
 /lib/rb/ext/thrift_native.bundle
 /lib/rb/ext/thrift_native.so
-/lib/rb/spec/gen-*
 /lib/rb/test/
 /lib/rb/thrift-*.gem
 /lib/php/Makefile
 /lib/php/Makefile.in
-/lib/php/src/ext/thrift_protocol/.deps
-/lib/php/src/ext/thrift_protocol/.libs
 /lib/php/src/ext/thrift_protocol/Makefile
 /lib/php/src/ext/thrift_protocol/Makefile.*
 /lib/php/src/ext/thrift_protocol/acinclude.m4
@@ -182,6 +179,8 @@
 /lib/php/src/ext/thrift_protocol/php_thrift_protocol.lo
 /lib/php/src/ext/thrift_protocol/run-tests.php
 /lib/php/src/ext/thrift_protocol/thrift_protocol.la
+/lib/php/src/ext/thrift_protocol/tmp-php.ini
+/lib/php/src/packages/
 /lib/php/test/Makefile
 /lib/php/test/Makefile.in
 /lib/erl/logs/
@@ -195,59 +194,28 @@
 /stamp-h1
 /test/Makefile
 /test/Makefile.in
-/test/cpp/.deps
-/test/cpp/.libs
-/test/cpp/*.la
-/test/cpp/*.lo
-/test/cpp/*.o
-/test/cpp/gen-*
 /test/cpp/Makefile
 /test/cpp/Makefile.in
 /test/cpp/StressTest
 /test/cpp/StressTestNonBlocking
 /test/cpp/TestClient
 /test/cpp/TestServer
-/test/hs/gen-*
 /test/hs/Makefile
 /test/hs/Makefile.in
 /test/log/
 /test/test.log
-/test/nodejs/gen-nodejs/
 /test/nodejs/Makefile
 /test/nodejs/Makefile.in
-/test/perl/gen-*
 /test/perl/Makefile
 /test/perl/Makefile.in
-/test/php/gen-*
 /test/php/Makefile
 /test/php/Makefile.in
 /test/py/Makefile
 /test/py/Makefile.in
-/test/py/gen-py
-/test/py/gen-py-*
 /test/py.twisted/Makefile
 /test/py.twisted/Makefile.in
 /test/py.twisted/_trial_temp/
-/test/py.twisted/gen-py.twisted/
 /test/py.twisted/test_suite.pyc
-/test/rb/gen-*
 /test/rb/Makefile
 /test/rb/Makefile.in
-/thrift.exe
 /ylwrap
-/compiler/cpp/Debug
-*.suo
-*.cache
-*.user
-*.ipch
-*.sdf
-
-*_ReSharper*
-lib/cpp/Debug/
-lib/cpp/Release/
-*.opensdf
-lib/cpp/x64/Debug/
-lib/cpp/x64/Release
-compiler/cpp/src/thrifty.h
-compiler/cpp/src/thrifty.cc
-compiler/cpp/src/thriftl.cc
\ No newline at end of file