mostly small changes
Merge branch 'master' of github.com:theunissenlab/operant
Small changes to the bird manager and some stimulus generation code