open-source bloomir
regression test
correcting the test
correcting test
Merge branch 'bloomir' of https://github.com/nasadi/Ivory into nasadi-bloomir
Merge branch 'master' into nasadi-bloomir

Conflicts:
	src/java/attic/ivory/core/driver/PreprocessFieldCollection.java
Moved ivory.smrf.retrieval.distributed to attic/
fix to incorrect use of Options package
fix to configuration issue
Tweaked build of autogen'ed scripts. Light refactoring.
Removed attempts to build run scripts under windows (doesn't work).
Additional tweak to remove windows-related directives.
fix to local cache loading during signature creation
fixing conflicts
Merge branch 'master' into bloomir
Regression test to verify relative recall
Merge branch 'bloomir' of https://github.com/nasadi/Ivory into nasadi-bloomir

Conflicts:
	src/java/attic/ivory/core/driver/PreprocessFieldCollection.java
Moved files.
Merge branch 'refactoring' into nasadi-bloomir-refactoring
separate test cases to resolve OOM issues