2ac should work for blocks now
Merge pull request #42 from neuromusic/2ac

2AC updates for one-wav-file-per-trial
zog updates
fixed pyaudio conflict
Merge branch 'zog' into dev
zog local config
Merge branch 'zog' into dev
fixes on vogel
getting validation working
added comedi_poll (formerly wait4peck)