Less magic

* Remove output=True, error=True feature for non-defer jobs
* Re-introduce dagID prefix to output/error files for defer jobs