MNT: Incorporate changes from master

Same content as for merge with lower-cased master@ebabd59f.

Author: pavoljuhas

README.rst

@@ -1,8 +1,8 @@
-.. image:: https://travis-ci.org/diffpy/diffpy.structure.svg?branch=python3
+.. image:: https://travis-ci.org/diffpy/diffpy.structure.svg?branch=master
    :target: https://travis-ci.org/diffpy/diffpy.structure
 
-.. image:: https://codecov.io/gh/diffpy/diffpy.structure/branch/python3/graph/badge.svg
-   :target: https://codecov.io/gh/diffpy/diffpy.structure/branch/python3
+.. image:: https://codecov.io/gh/diffpy/diffpy.structure/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/diffpy/diffpy.structure
 
 
 diffpy.structure

conda-recipe/meta.yaml

@@ -9,6 +9,7 @@ source:
   git_url: ..
 
 build:
+  preserve_egg_dir: True
   noarch: python
 
   # entry_points:

setup.py

@@ -77,7 +77,7 @@ def getversioncfg():
 setup_args = dict(
     name = "diffpy.structure",
     version = versiondata.get('DEFAULT', 'version'),
-    packages = [('diffpy.' + p) for p in find_packages('src/diffpy')],
+    packages = find_packages(os.path.join(MYDIR, 'src')),
     py_modules = ['diffpy.Structure'],
     package_dir = {'' : 'src'},
     test_suite = 'diffpy.structure.tests',