Merge branch 'release/3.10.3'
factorize the celery worker options code, and implement the new autoscale one.
version bump
Merge branch 'release/3.11'
add python-dev to linux installation, else 1flow install (and probably other) fails.
version bump
Merge branch 'release/3.11.1'

Conflicts:
	sparks/__init__.py
git-up is now available in python, and BTW the ruby version doesn't install anymore on Ubuntu 14.04.
version bump
Merge branch 'release/3.11.2'

Conflicts:
	sparks/__init__.py
Merge tag 'sparks-3.11.2' into develop

3.11.2
Python git-up needs zlib1g-dev to build.
version bump
Merge branch 'release/3.11.3'
Merge tag 'sparks-3.11.3' into develop

3.11.3