diff --git a/.gitignore b/.gitignore
index dbd578a62efa63c8e7cfb4d6cc5dc44475682f70..3a80e1c3e4ae34e015c434142cfc0585f0776e54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,143 +1,148 @@
-# NetBeans user-specific settings
-/bindings/java/nbproject/private/
-
-# Bindings dependecies and build folders
-/bindings/java/lib/
-/bindings/java/build/
-/bindings/java/dist
-/bindings/java/test/output/results
-/bindings/java/test/output/gold/dummy
-/bindings/java/test/output/gold/*_BU.txt
-/bindings/java/test/output/gold/*_CPP.txt
-/bindings/java/test/output/gold/*_CPP_SRT.txt
-/bindings/java/test/input
-/bindings/java/nbproject/genfiles.properties
-/bindings/java/nbproject/nbjdk.properties
-/bindings/java/nbproject/jdk.xml
-/bindings/java/nbproject/nbjdk.xml
-/bindings/java/libts*
-
-*.class
-/bindings/java/build/
-/bindings/java/dist/
-/bindings/java/nbproject/*
-!/bindings/java/nbproject/project.xml
-!/bindings/java/nbproject/project.properties
-
-# Windows build folders
-/win32/Debug_NoLibs/
-/win32/*/Debug_NoLibs/
-/win32/Debug/
-/win32/*/Debug/
-/win32/Release/
-/win32/*/Release/
-/win32/*/*.user
-win32/ipch
-win32/BuildErrors.txt
-framework/msvcpp/framework/Debug/
-framework/msvcpp/framework/Release/
-framework/msvcpp/*/*.user
-framework/msvcpp/*/Debug/
-framework/msvcpp/*/Release/
-framework/msvcpp/BuildLog.txt
-framework/msvcpp/*/ipch
-framework/runtime/
-framework/SampleConfig/to_install/
-framework/modules/*/win32/Debug/
-framework/modules/*/win32/Release/
-framework/modules/*/win32/*.user
-framework/modules/c_InterestingFilesModule/tsk
-
-# Release files
-release/sleuthkit-*
-
-# IntelliSense data
-/win32/*.ncb
-/win32/*.sdf
-framework/msvcpp/framework/*.ncb
-framework/msvcpp/framework/*sdf
-
-# Visual Studio user options
-/win32/tsk-win.suo
-framework/msvcpp/framework/*.suo
-*.sln.cache
-
-# Make crud
-*.o
-*.lo
-*.la
-*.jar
-Makefile
-.deps
-.libs
-
-#javadoc generated
-/bindings/java/javadoc
-
-# Files generated by running configure
-*.in
-stamp-h1
-tsk/tsk_config.h
-tsk/tsk_incs.h
-tools/fstools/blkcalc
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-libtool
-m4/libtool.m4
-m4/lt*.m4
-config/*
-
-
-# Executables
-samples/callback_cpp_style
-samples/callback_style
-samples/posix_cpp_style
-samples/posix_style
-samples/*.exe
-tests/fs_attrlist_apis
-tests/fs_fname_apis
-tests/fs_thread_test
-tests/read_apis
-tests/*.exe
-tools/autotools/tsk_comparedir
-tools/autotools/tsk_gettimes
-tools/autotools/tsk_loaddb
-tools/autotools/tsk_recover
-tools/fiwalk/plugins/jpeg_extract
-tools/fiwalk/src/fiwalk
-tools/fiwalk/src/test_arff
-tools/fstools/blkcat
-tools/fstools/blkls
-tools/fstools/blkstat
-tools/fstools/fcat
-tools/fstools/ffind
-tools/fstools/fls
-tools/fstools/fsstat
-tools/fstools/icat
-tools/fstools/ifind
-tools/fstools/ils
-tools/fstools/istat
-tools/fstools/jcat
-tools/fstools/jls
-tools/hashtools/hfind
-tools/imgtools/img_cat
-tools/imgtools/img_stat
-tools/sorter/sorter
-tools/srchtools/sigfind
-tools/srchtools/srch_strings
-tools/timeline/mactime
-tools/vstools/mmcat
-tools/vstools/mmls
-tools/vstools/mmstat
-tools/*/*.exe
-tools/*/*/*.exe
-
-# EMACS backup files
-*~
-
-# Mac Junk
-.DS_Store
+# NetBeans user-specific settings
+/bindings/java/nbproject/private/
 
+# Bindings dependecies and build folders
+/bindings/java/lib/
+/bindings/java/build/
+/bindings/java/dist
+/bindings/java/test/output/results
+/bindings/java/test/output/gold/dummy
+/bindings/java/test/output/gold/*_BU.txt
+/bindings/java/test/output/gold/*_CPP.txt
+/bindings/java/test/output/gold/*_CPP_SRT.txt
+/bindings/java/test/input
+/bindings/java/nbproject/genfiles.properties
+/bindings/java/nbproject/nbjdk.properties
+/bindings/java/nbproject/jdk.xml
+/bindings/java/nbproject/nbjdk.xml
+/bindings/java/libts*
+*~
+*.class
+/bindings/java/build/
+/bindings/java/dist/
+/bindings/java/nbproject/*
+!/bindings/java/nbproject/project.xml
+!/bindings/java/nbproject/project.properties
+
+# Windows build folders
+/win32/Debug_NoLibs/
+/win32/*/Debug_NoLibs/
+/win32/Debug/
+/win32/*/Debug/
+/win32/Release/
+/win32/*/Release/
+/win32/*/x64/
+/win32/*/*.user
+win32/ipch
+win32/BuildErrors.txt
+win32/BuildErrors-64bit.txt
+framework/msvcpp/framework/Debug/
+framework/msvcpp/framework/Release/
+framework/msvcpp/*/*.user
+framework/msvcpp/*/Debug/
+framework/msvcpp/*/Release/
+framework/msvcpp/BuildLog.txt
+framework/msvcpp/*/ipch
+framework/runtime/
+framework/SampleConfig/to_install/
+framework/modules/*/win32/Debug/
+framework/modules/*/win32/Release/
+framework/modules/*/win32/*.user
+framework/modules/c_InterestingFilesModule/tsk
+framework/config.h
+framework/tools/tsk_analyzeimg/tsk_analyzeimg
+framework/tools/tsk_validatepipeline/tsk_validatepipeline
+
+# Release files
+release/sleuthkit-*
+
+# IntelliSense data
+/win32/*.ncb
+/win32/*.sdf
+framework/msvcpp/framework/*.ncb
+framework/msvcpp/framework/*sdf
+
+# Visual Studio user options
+/win32/tsk-win.suo
+framework/msvcpp/framework/*.suo
+*.sln.cache
+win32/tsk-win.opensdf
+
+# Make crud
+*.o
+*.lo
+*.la
+*.jar
+Makefile
+.deps
+.libs
+*.swp
+
+#javadoc generated
+/bindings/java/javadoc
+
+# Files generated by running configure
+*.in
+stamp-h1
+tsk/tsk_config.h
+tsk/tsk_incs.h
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+libtool
+m4/libtool.m4
+m4/lt*.m4
+config/*
+
+
+# Executables
+samples/callback_cpp_style
+samples/callback_style
+samples/posix_cpp_style
+samples/posix_style
+samples/*.exe
+tests/fs_attrlist_apis
+tests/fs_fname_apis
+tests/fs_thread_test
+tests/read_apis
+tests/*.exe
+tools/autotools/tsk_comparedir
+tools/autotools/tsk_gettimes
+tools/autotools/tsk_loaddb
+tools/autotools/tsk_recover
+tools/fiwalk/plugins/jpeg_extract
+tools/fiwalk/src/fiwalk
+tools/fiwalk/src/test_arff
+tools/fstools/blkcat
+tools/fstools/blkcalc
+tools/fstools/blkls
+tools/fstools/blkstat
+tools/fstools/fcat
+tools/fstools/ffind
+tools/fstools/fls
+tools/fstools/fsstat
+tools/fstools/icat
+tools/fstools/ifind
+tools/fstools/ils
+tools/fstools/istat
+tools/fstools/jcat
+tools/fstools/jls
+tools/hashtools/hfind
+tools/imgtools/img_cat
+tools/imgtools/img_stat
+tools/sorter/sorter
+tools/srchtools/sigfind
+tools/srchtools/srch_strings
+tools/timeline/mactime
+tools/vstools/mmcat
+tools/vstools/mmls
+tools/vstools/mmstat
+tools/*/*.exe
+tools/*/*/*.exe
+# EMACS backup files
+*~
+
+# Mac Junk
+.DS_Store