Merge branch 'develop' into feature/upload-flow

Author: mfeurer

README.md

@@ -1,9 +1,16 @@
-[![Build Status](https://travis-ci.org/openml/openml-python.svg)](https://travis-ci.org/openml/openml-python)
-[![Code Health](https://landscape.io/github/openml/openml-python/master/landscape.svg)](https://landscape.io/github/openml/openml-python/master)
-[![Stories in Ready](https://badge.waffle.io/openml/openml-python.png?label=ready&title=Ready)](https://waffle.io/openml/openml-python)
-[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=develop)](https://coveralls.io/github/openml/openml-python?branch=develop)
-
 A python interface for [OpenML](http://openml.org). You can find the documentation on the [openml-python website](https://openml.github.io/openml-python).
 
 Please commit to the right branches following the gitflow pattern:
 http://nvie.com/posts/a-successful-git-branching-model/
+
+Master branch:
+
+[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=master)](https://travis-ci.org/openml/openml-python)
+[![Code Health](https://landscape.io/github/openml/openml-python/master/landscape.svg)](https://landscape.io/github/openml/openml-python/master)
+[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=master)](https://coveralls.io/github/openml/openml-python?branch=master)
+
+Development branch:
+
+[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=develop)](https://travis-ci.org/openml/openml-python)
+[![Code Health](https://landscape.io/github/openml/openml-python/master/landscape.svg)](https://landscape.io/github/openml/openml-python/master)
+[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=develop)](https://coveralls.io/github/openml/openml-python?branch=develop)

doc/progress.rst

@@ -6,6 +6,15 @@
 Progress
 ========
 
+Changelog
+=========
+
+0.3.0
+~~~~~
+
+* Add this changelog (Matthias Feurer)
+* 2nd example notebook PyOpenML.ipynb (Joaquin Vanschoren)
+
 API calls
 =========