Remove stray output
Fix "all branches are now synchronized" step
Fix bug in git-hack
Only force delete when needed
Merge branch 'master' into cr-hack