Merge pull request #2 from Psychtoolbox-3/master

pull in latest beta
Merge pull request #172 from kleinerm/master

Pull Linux display locking fixes.
Merge pull request #174 from kleinerm/master

PTB BETA RELEASE "Hammertime!" SP4 - "Deadlock"

* XLib threading fixes for regressions introduced into Linux PTB.
* Make DaqDeviceIndex a bit more robust on OSX.
* Make IsomerizationInEye/DishDemo work again on Octave and fix some bugs.
* Reenable parts of PsychCV for 64-Bit Octave on Linux. (Experimental)
10/24/13  dhb     Pass scaling args to packing routine and truncate test image.  These were needed to make this work with my Bits++ in Color++ mode today.  I think the cropping has to do with the spatial res of my
monitor.  How this ever worked without the scaling args, though, is unclear to me.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Merge branch 'master' of https://github.com/Psychtoolbox-3/Psychtoolbox-3
Make these work on at least one version of Linux, by letting the trials of various possible paths execute under Linux as well as OS/X.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Expanded comment.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Fix stray characters at end.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Merge branch 'upstream/master'
version check died now that we're at matlab 8.0
Merge pull request #177 from dcnieho/master

Fix version check error in Explode.m for Matlab 8.0 and later.
Added rod and melanopsin entries.  Still need to test.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Merge branch 'master' of https://github.com/Psychtoolbox-3/Psychtoolbox-3
Added RodFundamentalTest, MelanopsinFundamentalTest.  Also T_melanopsin.   Got them all working nicely.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Comment tweak.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>
Merge branch 'upstream/master'
Staircase now using better interface consisting of struct of function handles when in v2 mode. When staircase is created with original call (no inputs), nothing has changed for the user. Internals are reworked though...
construct lookup table so that we evaluate psychometric function only once for each probe level
set_psychometric_func immediately checks if requested psychometric function is valid and creates function handle (so we get rid of a switch in the inner loop)
made sure precomputeLookup exits early when nothing todo
now have useer setting to force lookup table use on or off. if not set, lookup table is created if it isn't too large
now have a compressed version of the lookup table if stepsize of probeset and aset are the same