add cancelling to Job#active?

Long running cancellations will show an odd screen in deploys/show
handle nil lock descriptions
add bundler to the Gemfile

Caused problems with Samson deploys
Merge pull request #34 from zendesk/sdavidovitz/downstream

Downstream patches