remove unecessary methods
switch Map.job_id to a FK to Job
Merge branch 'master' into bpp