Move file to queue if ctrl-c, to error otherwise

Job processor now returns a file to the jobs queue if ctrl-c detected.
Otherwise, if an actual error is thrown, moves file to the error folder.
Merge remote-tracking branch 'origin/master' into matthiasMCorr