Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	README.rst
Merge branch 'master' into develop
Following change in REST API
Fixing setup.py exit code for Continuous delivery to pypi #4
Ignore any pylint errors in upload.py