Merge branch 'master' of github.com:flowdock/heaven
Merge pull request #92 from flowdock/task-data

Read deployment task name from correct place
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into flowdock
Add BRANCH env to bundler_capistrano deploy
Merge branch 'bundler-capistrano-cap3-support' into flowdock