Merge dev into diadems

diff --cc setup.py
index f92588269dba5e6ada99a62a9fbd6d376556fde0,e7f13960a20e646b4364c3cfa3027c5399cea866..e24d0dfcdba3a08119f3f97c554bcde7617c1a64
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -61,14 -60,9 +61,12 @@@ setup
          'django-extensions',
          'djangorestframework',
          'south',
 +        'py_sonicvisualiser',
 +        'pyannote.core',
 +        'pyannote.features',
          'traits',
          'networkx',
-         'sphinx_rtd_theme',
-     ],
- 
+         ],
      platforms=['OS Independent'],
      license='Gnu Public License V2',
      classifiers=CLASSIFIERS,

diff --cc tests/test_analyzers_stress.py
Simple merge

diff --cc timeside/analyzer/core.py
Simple merge

diff --cc timeside/analyzer/irit_noise_startSilences.py
Simple merge