Merge pull request #294 from jeremygray/eef32adf9e030e42156fc0e74f36bb706b86436a

advanced audio capture, with demo
Merge pull request #295 from jeremygray/master

changelogs
DOCs: advanced audio capture
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy: