Add auto-merge and master deploys

Update jarvis to add master deploys:
```
jarvis i'm deploying repo/master
```

And auto-merge:
```
jarvis i'm done deploying
<MERGE>
```

Tagging @Drewzar for review.