all changes
Merge remote-tracking branch 'origin/develop' into prunetrain

Conflicts:
	code/util/de_MakeDataset.m
latest values
test run on std
tweaking scripts to use homeostasis on firing variance
getting things to work on 34x25, initial pass for 68x50 for lamb_yund_1993
pushing everything, including unknown amir files
Merge branch 'homeo-variance' of guru.ucsd.edu:DifferentialEncoding into homeo-variance

Conflicts:
	scripts/recfields/expt1/simulate_amir-1.mat
	scripts/recfields/expt2.10/simulate_amir-2.mat
	scripts/recfields/expt2.5-25/simulate_amir-2.mat
Merge branch 'homeo-variance' of guru.ucsd.edu:DifferentialEncoding into contrast-balancing

Conflicts:
	scripts/34x25/sergent_1982/uber_sergent_sergent.m
	scripts/recfields/vary_sigma.m
	scripts/recfields/vary_sigma.mat
Merge branch 'contrast-balancing' of guru.ucsd.edu:DifferentialEncoding into contrast-balancing

Conflicts:
	.gitignore
	code/_expts/sergent_1982/de_StimCreate.m
changing paramters to work for 68x50
remove old connector code
script tweaks
Merge branch 'contrast-balancing' of guru.ucsd.edu:~/DifferentialEncoding into clean_and_document
discovery?
tweaking params to make things run.
documenting different DE types
adding dropout to the fields for caching models.
some changes... it's been a while.
Merge branch 'homeo-variance' of guru.ucsd.edu:~/DifferentialEncoding into clean_and_document