not enough to recreate, but these files are annoying me. Hopefully I'll set this up later (but as you already know, I won't... :$
broken scripts that could be salvaged, but ... LATER :)
1D differential encoding model
Merge branch 'develop', remote-tracking branch 'origin' into COSYNE_2013
running on 100 samples; plots now linearly interpolate colors
moving around figures, small tweaks.  accidentally included some stuff from 2layer... oh well.
all changes
Merge remote-tracking branch 'origin/develop' into prunetrain

Conflicts:
	code/util/de_MakeDataset.m
latest values
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
Merge branch 'amir' of guru.ucsd.edu:DifferentialEncoding into amir

Conflicts:
	.gitignore
asdf
adding files for exploring relationship between sigma and nconns on minimum nearest neighbor length
test run on std