Fix delivery of stories with no estimate

Occasionally we end up deploying stories that haven't been estimated (yes yes, bad us). Unfortunately, deploy_and_deliver causes Capistrano to fail in those cases.

This pull requests fixes that.

It also contains spec fixes from https://github.com/collectiveidea/deploy_and_deliver/pull/2 - I kinda prefer working on green test suites ;)