diff --git a/.gitignore b/.gitignore
index 6f60d65a47..e69de29bb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,161 +0,0 @@
-*~
-3rdParty/icu/BUILD/
-3rdParty/icu/source/*/*/*.ao
-3rdParty/icu/source/*/*.ao
-3rdParty/icu/source/common/svchook.mk
-3rdParty/icu/source/config/icu-config
-3rdParty/icu/source/config/icu-config.1
-3rdParty/icu/source/config/icu-i18n.pc
-3rdParty/icu/source/config/icu-io.pc
-3rdParty/icu/source/config/icu-le.pc
-3rdParty/icu/source/config/icu-lx.pc
-3rdParty/icu/source/config/icu.pc
-3rdParty/icu/source/config/icu-uc.pc
-3rdParty/icu/source/config/Makefile.inc
-3rdParty/icu/source/config/pkgdata.inc
-3rdParty/icu/source/config/pkgdataMakefile
-3rdParty/icu/source/*/*/*.d
-3rdParty/icu/source/*/*.d
-3rdParty/icu/source/data/icupkg.inc
-3rdParty/icu/source/data/pkgdataMakefile
-3rdParty/icu/source/extra/uconv/pkgdataMakefile
-3rdParty/icu/source/icudefs.mk
-3rdParty/icu/source/test/testdata/pkgdataMakefile
-3rdParty/icu/source/tools/genbrk/genbrk.1
-3rdParty/icu/source/tools/genccode/genccode.8
-3rdParty/icu/source/tools/gencmn/gencmn.8
-3rdParty/icu/source/tools/gencnval/gencnval.1
-3rdParty/icu/source/tools/genctd/genctd.1
-3rdParty/icu/source/tools/genrb/derb.1
-3rdParty/icu/source/tools/genrb/genrb.1
-3rdParty/icu/source/tools/gensprep/gensprep.8
-3rdParty/icu/source/tools/gentest/gentest
-3rdParty/icu/source/tools/icuinfo/icuinfo
-3rdParty/icu/source/tools/icupkg/icupkg.8
-3rdParty/icu/source/tools/makeconv/makeconv.1
-3rdParty/icu/source/tools/pkgdata/pkgdata.1
-3rdParty/libev/BUILD
-3rdParty/libev/libtool
-3rdParty/mruby/bin/mrbc
-3rdParty/mruby/bin/mruby
-3rdParty/mruby/bin/mrubysample
-3rdParty/mruby/GIT
-3rdParty/mruby/GPATH
-3rdParty/mruby/GRTAGS
-3rdParty/mruby/GTAGS
-3rdParty/mruby/mrblib/mrblib.c
-3rdParty/mruby/mrblib/mrblib.ctmp
-3rdParty/mruby/mrblib/mrblib.rbtmp
-3rdParty/ptmalloc3/tst-independent-alloc
-3rdParty/ptmalloc3/t-test1
-3rdParty/ptmalloc3/t-test2
-aclocal.m4
-arangod/Ahuacatl/ahuacatl-grammar.output
-ARCH.*
-autom4te.cache
-bin
-build.h
-build.info
-commit.sh
-config/compile
-config/config.guess
-config/config.h
-config/config.sub
-config/depcomp
-config.h
-config/install-sh
-config.log
-config/missing
-config/revision.sh
-config.status
-configure
-config/version.sh
-COVERAGE
-.deps
-.dirstamp
-Documentation/arango.doxy
-Documentation/arango.template
-Documentation/html/
-Documentation/js
-Documentation/latex/
-Documentation/manuals
-Documentation/web/*.html
-Documentation/wiki/
-Documentation/xml/
-Doxygen/*.doxy
-Doxygen/html
-Doxygen/js
-Doxygen/latex
-Doxygen/.setup-directories
-Doxygen/wiki
-Doxygen/xml
-.DS_Store
-etc/arangodb/*.conf
-*.gcda
-*.gcno
-GPATH
-GRTAGS
-GTAGS
-.icu-build-*
-Installation/arangod.conf
-*.la
-lib*.a
-lib/BasicsC/local-configuration.h
-lib/Documentation/*.pdf
-.libev-build-*
-lib/JsonParserX/JsonParserX.output
-.libs
-*.lo
-m4/component.engine
-m4/component.files
-m4/component.storage
-m4/configure.3rdParty
-m4/configure.curl
-m4/configure.cxxtest
-m4/configure.documentation
-m4/configure.edition
-m4/configure.libtool
-m4/configure.missing
-m4/configure.mysql
-m4/configure.odbc
-m4/configure.profiler
-m4/configure.standard
-m4/configure.tex
-m4/external.boost-test
-m4/external.libxml2
-Makefile
-Makefile.in
-Makefile.local
-.mruby-build-*
-nbproject/
-*.o
-*.old
-out
-*.Po
-*.pyc
-.setup-js-directories
-.setup-mr-directories
-stamp-h*
-.svn
-*.swp
-tags
-TAGS
-UnitTests/basics_suite
-UnitTests/geo_suite
-UnitTests/HttpInterface/Gemfile.lock
-UnitTests/HttpInterface/logs
-UnitTests/Jutland/CsvReaderTest.cpp
-UnitTests/Jutland/Makefile.am
-UnitTests/Jutland/Makefile.py
-UnitTests/Jutland/Runner.cpp
-UnitTests/Philadelphia/Makefile.am
-UnitTests/Philadelphia/Makefile.py
-UnitTests/Philadelphia/Runner.cpp
-.v8-build-*
-VC++
-VisualStudio/Arango Front End Library/Debug/*
-VisualStudio/Arango MRuby Library/Debug/*
-VisualStudio/Arango V8 Library/Debug/*
-VisualStudio/ArangoDB/Debug/*
-VisualStudio/Arangod Binary/Debug/*
-VisualStudio/Debug/*