Fixed redundant code, and null error in job.py related to retrying a job
Merge branch 'master' into dbconfig for issue #129