removed deprecated validate_with_original
fixed cmd option
.gitignore enriched from https://github.com/github/gitignore