Merge branch 'master' into dev

diff --cc README.rst
index ac8abc9fdf0760b2b1ddc42adf7a9cd61bf71f76,b260cbcda1648095d701d7911cdd9acc8bf57cdd..40b3b5adda5e2c7f5e4be714b10f4bd944e975bb
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -131,12 -131,11 +131,11 @@@ Documentatio
  =============
  
   * `FAQ and Wiki <https://github.com/yomguy/DeeFuzzer/wiki>`_
 - * `API <http://files.parisson.com/doc/deefuzzer/>`_ 
 + * `API <http://files.parisson.com/doc/deefuzzer/>`_
   * `Documented XML configuration <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer_doc.xml>`_
   * Configuration examples:
 -     
 +
       * `Dummy XML for testing <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer.xml>`_
-      * `OGG Vorbis and MP3 together <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer_mp3_ogg.xml>`_
       * `Generic YAML <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer.yaml>`_