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.