Minor locking change in time-map
Merge pull request #21 from joakim-hove/time-map-bug

Added diagonstic and fixed (minor) locking bug in time_map
Merge branch 'master' of github.com:Ensembles/ert
Changed lsf driver to use unconverted integer status from LSF + a pure status conversion function
Merge branch 'master' into lsf-config
Minor bugs in status conversion - added lsf status 192
Added job_lsf_submit_test.c + fixed bug with kill of shell job