Added more information in crash-and-burn on time_map inconsistency
Merge branch 'max-submit-bug'
Merge branch 'master' into QC
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
Merge branch 'master' into QC