Merge : fixes some minor conflicts

diff --cc timeside/decoder/live.py
index 539575ff7193bce4703534c6a70ed0a9cd1e70b3,ed333bb4a0bbb49582abe1b727ec0c9b386134ed..e89e45af44ece7b8c467bd1d9437476773caf704
--- 1/timeside/decoder/live.py
--- 2/timeside/decoder/live.py
+++ b/timeside/decoder/live.py
@@@ -62,12 -62,11 +62,13 @@@ class LiveDecoder(Decoder)
  
          >>> import timeside
  
 -        >>> live = timeside.decoder.LiveDecoder(num_buffers=25)
 +        >>> live = timeside.decoder.LiveDecoder(num_buffers=5)
          >>> a = timeside.analyzer.Waveform()
 -        >>> e = timeside.encoder.Mp3Encoder('test_live.mp3', overwrite=True)
 +        >>> e = timeside.encoder.Mp3Encoder('/tmp/test_live.mp3',
 +        ...                                 overwrite=True)
          >>> pipe = (live | a | e)
 -        >>> pipe.run() # doctest: +SKIP    
 +        >>> pipe.run() # doctest: +SKIP
++        >>> pipe.run() # doctest: +SKIP
  
          >>> import matplotlib.pyplot as plt # doctest: +SKIP
          >>> plt.plot(a.results['waveform_analyzer'].time, # doctest: +SKIP