Zeroing in on parameter selection, bias selection was broken thoguh (set to 0)
Merge branch 'master' of bitbucket.org:jvmcdonnell/rationalhaskell

Conflicts:
	fit_glc.R
Merge branch 'master' of bitbucket.org:jvmcdonnell/rationalhaskell

Conflicts:
	fit_glc.R
Updated softmax function to be deterministic w/ tau=0
Merge branch 'master' of bitbucket.org:jvmcdonnell/rationalhaskell

Conflicts:
	fit_glc.R
Variable number of trials in Vandist task.
Recreate vandist figure showing no help from unlabeled items.
Merge branch 'master' of github.com:johnmcdonnell/rationalHaskell

Settled on 'numtrials.'

Conflicts:
	runanderson.hs
	vandist.R