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 'develop' of github.com:bcipolli/DifferentialEncoding into amir

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

Amir et al simulations