Simple naming fix and pycharm-friendly gitignore

[cwitkowitz]

Without this fix, the reset does not work properly, and results in half of the files in "validation/" and the other half in "val/"

[ethman]

Thanks for catching that!