rolled the jobdirs-atomic and submit-atomic rules into one in the Makefile