Go back to --force for git push in update_branch

If the promotion ref is manually updated by a developer they expect
Kochiku to overwrite it.
Switch from git cherry to git merge-base --is-ancestor

merge-base is the appropriate command to use in a programmatic situation.
Merge pull request #87 from square/rob/update-like-you-mean-it

Use `git push --force` during promotion