updated to allow sub-runs
Merge branch 'devel' of github.com:joshua-decoder/joshua into devel