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

Conflicts:
	code/util/de_MakeDataset.m
latest values
Updating pruning scripts
Merge branch 'prunetrain' into COGSCI_2014

Conflicts:
	.gitignore
	scripts/pruning/create_dataset.m