Expand gitignore to compensate for a data directory, simplify file names, auto-create data directory.