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... :$
Merge branch 'develop', remote-tracking branch 'origin' into COSYNE_2013
running on 100 samples; plots now linearly interpolate colors
fixing up normalization information, creating a function from a script.
cleanup, and parameter change in simulate_amir
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
Merge branch 'COSYNE_20132' of github.com:bcipolli/DifferentialEncoding into COSYNE_2013
Merge pull request #4 from bcipolli/COSYNE_20133

Cosyne 2013 - linearly interpolate colors.
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into amir

Conflicts:
	.gitignore
Merge pull request #5 from bcipolli/amir

Amir et al simulations
Create README.md
Merge branch 'COSYNE_20132' of github.com:bcipolli/DifferentialEncoding into develop

Conflicts:
	scripts/recfields/vary_sigma.m
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into develop
computing inter-patch distance and plotting as a function of sigma and nconns