Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into develop

Conflicts:
	.gitignore
	tsk/auto/db_sqlite.cpp
Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into develop

Conflicts:
	.gitignore
	tsk/auto/db_sqlite.cpp
Fixed building error on non-windows platforms.
Merge pull request #273 from jawallace/build_error

Build error