Added "random_fixed_subset"

to the sampling options - so we can sample spikes from fixed, but
randomly chosen, subset
Merge branch 'master' of https://github.com/danielso/Shotgun

Conflicts:
	Main.m