Merge branch 'stderrFileCap'
Modifying the readme to be more accurate in light of genie 2
Merge branch 'master' into develop