Merge branch 'devel' of github.com:SheffieldML/GPy into devel

.travis.yml

@@ -48,9 +48,11 @@ before_deploy:
   - make html
   - cd ../
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]];
-      then export DIST='sdist';
+    then 
+      export DIST='sdist';
     elif [[ "$TRAVIS_OS_NAME" == "osx" ]];
-      then export DIST='bdist_wheel';
+    then 
+      export DIST='bdist_wheel';
     fi;
 
 deploy:
@@ -61,5 +63,6 @@ deploy:
   on:
     tags: true
     branch: deploy
+  condition: "$TRAVIS_OS_NAME" == "osx" || ( "$TRAVIS_OS_NAME" == "linux" && "$PYTHON_VERSION" == "2.7" )
   distributions: $DIST
   skip_cleanup: true

setup.cfg

@@ -11,3 +11,6 @@ universal = 1
 [upload_docs]
 upload-dir = doc/build/html
 
+[medatdata]
+description-file = README.rst
+