Cleanup of some recently added attributes.
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h
Merge pull request #209 from raman-bt/master

Cleanup of recently added attributes.
Merge pull request #208 from jawallace/master

Mac OS X Datamodel
Merge pull request #210 from jawallace/master

Error in previous pull request.
Applied fix that takes sequence number into account when looking up parent.
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Move xmlns declarations to root element

The XML namespace declarations in Fiwalk have been at the wrong point
in the XML tree.  Being where they were, only one or two elements would
get any namespace assigned to them.

Applying this patch, the output of Fiwalk is now valid DFXML according
to the (draft) XML Schema at:
<https://github.com/dfxml-working-group/dfxml_schema/blob/v1.1.0rfc0/dfxml.xsd>

After some discussion with the DFXML Working Group, it will be
appropriate to bump the /dfxml/@version attribute to "1.1.0" to indicate
support of an official DFXML Schema version; however, the current
schema version is a Request for Comments.  Input on the schema is
welcome.

Signed-off-by: Alex Nelson <a.nelson@prometheuscomputing.com>
moved vs_close to after it is done being used.  patch from Joachim Metz
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Fixed mmls to how it was before.  it was correct.
mmls fix again, correct this time...
Merge pull request #212 from ajnelson/adjust_fiwalk_dfxml

Move xmlns declarations to root element
Minor updates for 64-bit builds