Merge pull request #516 from isolver/master

avbin import on Windows
Merge branch 'master' of git://github.com/psychopy/psychopy
Revert "BF: avbin.dll WindowsError exception"

This reverts commit 01ed8bfe1b909be7a4c431d834c820c314239a19.