Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.rst
Adding continuous delivery to pypi
Fail on errors
Bleh.
Cosmetic
* Improve error handling for expired plan #5
* Improved exit code, now we don't return 0 when we had issues
Fixing unittests after adding extra restriction
Version bump
Merge branch 'master' into develop