broken scripts that could be salvaged, but ... LATER :)
1D differential encoding model
moving around figures, small tweaks.  accidentally included some stuff from 2layer... oh well.
updating summary info
Merge branch 'p_dataset' of guru.ucsd.edu:DifferentialEncoding into p_dataset
all changes
Merge remote-tracking branch 'origin/develop' into prunetrain

Conflicts:
	code/util/de_MakeDataset.m
latest values
moving results OUT
don't save images or output; should be put elsewhere
Merge branch 'amir' into develop
Merge branch 'p_dataset' of guru.ucsd.edu:DifferentialEncoding into p_dataset
Merge remote-tracking branch 'origin/p_dataset' into develop
fixing up normalization information, creating a function from a script.
cleanup, and parameter change in simulate_amir
small updates
generalizing nn_dist calculation
Merge branch 'amir' of guru.ucsd.edu:DifferentialEncoding into amir

Conflicts:
	scripts/recfields/simulate_amir.m
adding previously missing file
updating git ignore