Raise a warning instead of dying when the history file is invalid

Fixes #838.
Merge branch 'master' of github.com:conda/conda