Merge remote-tracking branch 'remotes/upstream/dev' into dev

Conflicts:
	setup.py

diff --cc README.rst
index 9f877c219220944ce6cc90068c460784d7b300c0,04b2e7e73ecaeabfcaf86306d9ca3325308ef91e..ca679bef87bddfb6c347190f98f9024bfd193462
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -22,16 -36,32 +36,32 @@@ Feature
   * Very light and optimized streaming process
   * Fully written in Python
   * Works with Icecast2, ShoutCast, Stream-m
-  * EXPERIMENTAL: WebM video streaming support
  
- It is only neccessary to provide a config file which sets all needed parameters.
- Please see example/deefuzzer.xml for an example.
+ Because our aim is to get DeeFuzzer as light as possible it is NOT capable of re-encoding or transcoding media files for the moment.
  
- Because our aim is to get DeeFuzzer as light as possible it is NOT capable of re-encoding or transcoding media files.
  
  News
 -=====
 +====
  
+ 0.7
+ 
+  * Huge refactoring which should be compatible with old setups, but please read the `updated example <https://github.com/yomguy/DeeFuzzer/blob/dev/example/deefuzzer_doc.xml>`_ before going on
+  * Reworked the RSS feed handling to allow JSON output as well and more configuration options (@achbed #27 #28)
+  * Add an init.d script to act as a deamon (@achbed)
+  * Add stationdefaults preference (apply default settings to all stations) (@achbed #31)
+  * Add stationfolder preference (generate stations automagically from a folder structure) (@achbed #31) 
+  * Add stationconfig preference (load other preference files as stations) (@achbed #31)
+  * Add new station.server.appendtype option
+  * Add new base_dir parameter to station definition
+  * New stationdefaults parameter (provides a mechanism to give default values for all stations) (@achbed #29)
+  * Better thread management (@achbed #36 #37 #38)
+  * Improved stability avoiding crashes with automatic station restart methods (@achbed #39 #45)
+  * Added option (ignoreerrors) to log and continue when an error occurs during station setup (@achbed #43)
+  * Cleanup, better doucmentation and good ideas (@choiz #15 #16 #17 #23)
+  * Various bufixes
+  * Many thanks to all participants and especially to @achbed for his **huge** work, efficiency and easy collaboration
+  * Enjoy!
+ 
  0.6.6
  
   * Update station name (remove ": http://url")
@@@ -260,22 -249,23 +249,23 @@@ AP
  
  http://files.parisson.com/doc/deefuzzer/
  
+ 
  Development
 -============
 +===========
  
  Everybody is welcome to participate to the DeeFuzzer project!
  We use GitHub to collaborate: https://github.com/yomguy/DeeFuzzer
  
- Join us!
+ Clone it, star it, join us!
+ 
  
- Author
- ======
+ Authors
+ =======
  
- YomguY aka Guillaume Pellerin:
+  * @yomguy +GuillaumePellerin yomguy@parisson.com
 - * @achbed
++ * @achbed +achbed github@achbed.org
+  * @choiz
  
-  * twitter   @yomguy @parisson_studio
-  * g+        +Guillaume Pellerin
-  * email     <yomguy@parisson.com>
  
  License
  =======

diff --cc setup.py
index b0c6bf93abfad310f34430b5888e3c3f3a0a6583,bbfc97ca5e5c40a78e8d6eb0cebbd1a969f5d2e5..4bb332030ce5d5781afc86c2c541932f418588cc
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -26,13 -24,15 +26,14 @@@ setup
          'python-twitter',
          'mutagen',
          'pyliblo',
-         'pycurl'
+         'pycurl',
 -        'pyyaml',
 -  ],
 -  platforms=['OS Independent'],
 -  license='CeCILL v2',
 -  scripts=['scripts/deefuzzer'],
 -  classifiers = CLASSIFIERS,
 -  packages = find_packages(),
 -  include_package_data = True,
 -  zip_safe = False,
++        'pyyaml'
 +    ],
 +    platforms=['OS Independent'],
 +    license='CeCILL v2',
 +    scripts=['scripts/deefuzzer'],
 +    classifiers=CLASSIFIERS,
 +    packages=find_packages(),
 +    include_package_data=True,
 +    zip_safe=False
  )
 -