clean up error messages

Change-Id: Iff96d8ffafb218a2c517358e93c110614403a61e
Consolidate TOODs.

Change-Id: I8719cde6513bb57ca657cb5220d0b1645283fb66
Parse output of 'git status' more conservatively.

Also make 'review sync' say when it has switched back to master.

Change-Id: I9f17e32e9d306eb3193103da36796877967059d2
Add a couple more todos; very minor refactoring.

Change-Id: I9ae2c18cea1ac1b4fb851cc819ac31e65dba1852