Merge branch 'master' into release_0.2

# Conflicts:
#	requirements.txt
#	setup.py

MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+recursive-include spectrum_overload/data *
+recursive-inlude Notebooks * 
+recursive-inlude docs * 

setup.py

@@ -55,15 +55,10 @@
     classifiers=[
         'Development Status :: 4 - Beta',
 
-        # Indicate who your project is intended for
         'Intended Audience :: Science/Research',
         'Topic :: Scientific/Engineering :: Astronomy',
         'Topic :: Scientific/Engineering :: Physics',
         'License :: OSI Approved :: MIT License',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
@@ -72,8 +67,7 @@
         'Natural Language :: English',
     ],
 
-    # What does your project relate to?
-    keywords=['astronomy', 'spectra', 'spectroscopy'],
+    keywords=['astronomy', 'spectra', 'spectroscopy', "CRIRES"],
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
@@ -90,10 +84,9 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=requirements,
-    #install_requires=[],
-    #install_requires=["numpy", "scipy", "astropy", "pyastronomy"],
+    #install_requires=requirements,
     setup_requires=['pytest-runner'],
-    tests_require=['pytest', "hypothesis"],
+    tests_require=['pytest', "hypothesis", "pytest-cov"],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:
@@ -110,13 +103,7 @@
     package_data={"spectrum_overload": ["data/*.fits"]},
     #    'sample': ['package_data.dat'],
     # },
-
-    # Although 'package_data' is the preferred approach, in some case you may
-    # need to place data files outside of your packages. See:
-    # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files
-    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
-    #data_files=[('my_data', ['data/data_file'])],
-    data_files=[],
+    include_package_data=True,
 
     # To provide executable scripts, use entry points in preference to the
     # "scripts" keyword. Entry points provide cross-platform support and allow