Merge branch 'master' into tatum

diff --cc example_aubioDemo/src/ofApp.cpp
index 6180041,022ad7a..b0c5196
--- 1/example_aubioDemo/src/ofApp.cpp
--- 2/example_aubioDemo/src/ofApp.cpp
+++ b/example_aubioDemo/src/ofApp.cpp
@@@ -182,12 -174,6 +182,12 @@@ void ofApp::onsetEvent(float & time) 
  
  //----
  void ofApp::beatEvent(float & time) {
-     ofLog() << "got beat at " << time << " s";
+     //ofLog() << "got beat at " << time << " s";
      gotBeat = true;
  }
 +
 +//----
 +void ofApp::tatumEvent(int & t) {
 +    //ofLog() << "got tatum at " << time << " samples";
 +    gotTatum = true;
 +}