updated gitignore
Finished up revised data prep script
Updated machinery to reflect new data prep