Merge branch 'dev' into aubio

diff --cc timeside/analyzer/__init__.py
index 504d50f7780a62bfc0881f35129489ebb746e378,0d05ae7db05a0d3d2d7474f3c89446b26ce250f1..f8633db1cd0cea3e17de64a641586091418318f7
--- 1/timeside/analyzer/__init__.py
--- 2/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -3,9 -3,5 +3,7 @@@
  from max_level import *
  from mean_level import *
  from dc import *
 +from aubio_bpm import *
 +from aubio_onsetrate import *
  
+