Merge branch 'master' into 2_file_readers_and_writers

Makefile

@@ -1,7 +1,7 @@
 # This file has been auto-generated.
 # All changes will be lost, see Projectfile.
 #
-# Updated at 2016-12-26 14:09:09.609408
+# Updated at 2016-12-28 11:17:56.199090
 
 PYTHON ?= $(shell which python)
 PYTHON_BASENAME ?= $(shell basename $(PYTHON))

Projectfile

@@ -4,7 +4,7 @@ name = 'bonobo'
 description = 'Bonobo'
 license = 'Apache License, Version 2.0'
 
-url = 'https://github.com/python-bonobo/bonobo'
+url = 'https://bonobo-project.org/'
 download_url = 'https://github.com/python-bonobo/bonobo/tarball/{version}'
 
 author = 'Romain Dorgueil'

setup.py

@@ -38,5 +38,5 @@ setup(
         ],
         'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']
     },
-    url='https://github.com/python-bonobo/bonobo',
+    url='https://bonobo-project.org/',
     download_url='https://github.com/python-bonobo/bonobo/tarball/{version}'.format(version=version), )