added the possibility to specify the input and output checks on input / output files. fixes #258
merged with the lastest changes on master
Revert "merged with the lastest changes on master"

This reverts commit ebef2ef9f7c6d0a9bbc50db8560f0b4ed4b3e63e.
added the necessary changes to compile with CDH3
fixed the failing unit test