Merge branch 'master' of git://github.com/psychopy/psychopy

Merge: should fix testing?
git push origin masterMerge branch 'master' of git://github.com/psychopy/psychopy
Psychopy OSX 64-bit compatibility added

Got psychopy to work on 64-bit OSX systems, with pyglet 1.2 alpha 1
Corrected system check for pyglet.lib overload
Another corrected platform check

This one slipped my attention for a minute
Platform checks done right this time
Merge pull request #574 from hoechenberger/master

Small doc cleanups for gui.fileSaveDlg() and gui.fileOpenDlg().
ENH: ioSync now supports analog input thresholds

Each analog input channel can have a threshold set. If the analog input
goes above or below the threshold level for that channel, a
ThresholdEvent is created.

Can be used to set voice key or light key 'triggering' sensitivity.
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge pull request #575 from isolver/master

ENH: ioSync support for analog input thresholds
Merge branch 'master' of git://github.com/psychopy/psychopy
Don't draw lines when lineWidth is 0.
Merge pull request #576 from nortcele/master

Don't draw lines when lineWidth is 0.
BF: Releasing vlc related ctypes obj's

Hopefully this will fix the pygame crash at end of movie playback demo.

Also ENH:
- no audio support option (took 5 minutes)

- function can be passed as a kwarg to the movie __init__ , which will
be called each time a frame is decoded.
Callback MUST take the form:

def myFrameProcFuncName(frame_index, frame_data):
# frame_index : index in the video for the frame_data.
# frame data : a numpy array of
# (video_height, video_width, 3) shape, with the 3 being
# the r, g, b color channels for each pixel. element type is
# uint8, valid values being 0 - 255.

# Do what you want to the frame array; as long
# as the array returned has same shape as array arg.
# ....

# Callback MUST return the updated frame data array
# Returned array can be same frame_data array passed
# into func, or it can be a copy, as long as shape
# and dtype have not changed.
return frame_data
RF: adjust Builder width of component as drawn on timeline

- seems to have drifted off; looks right with this fix
Merge pull request #577 from isolver/master

BF: Releasing vlc related ctypes obj's
Merge pull request #578 from jeremygray/master

RF: adjust Builder width of component as drawn on timeline
BF: TextBox crash on OS X

Seems that on OS X, a .ttf file can actually be a text file that
contains paths to actual TTF files. TextBox was not handling the case of
reading in a ttf file that was not a TTF.

Now fixed.
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge pull request #579 from isolver/master

BF: TextBox crash on OS X