Support 'on_fail'==fix.

Add back the on_fail==fix support to the validator. Clean up dependency oddities and add tf-keras support because of new keras compatibility issues when reading in TensorFlow models.