Adding more uniqueness for job ids from slurm (now user and number of nodes has to match). Refactored a little as well.