Merge branch 'release_branch' into restructure_turbine_data_reading

Author: SabineHaas

doc/modules.rst

@@ -68,8 +68,10 @@ power curve or power coefficient curve needed by the :py:class:`~.wind_turbine.W
    :toctree: temp/
 
    wind_turbine.WindTurbine.fetch_turbine_data
+   wind_turbine.get_turbine_data_from_file
+   wind_turbine.get_turbine_data_from_oedb
+   wind_turbine.load_turbine_data_from_oedb
    wind_turbine.get_turbine_types
-   wind_turbine.read_turbine_data
 
 .. _wind_farm_label:
 

setup.py

@@ -17,4 +17,5 @@ def read(fname):
       long_description=read('README.rst'),
       zip_safe=False,
       install_requires=['numpy >= 1.7.0',
-                        'pandas >= 0.13.1'])
+                        'pandas >= 0.13.1',
+                        'requests'])