Fix some bugs

* Suppress unneeded error output
* Fix improper display of rebase indicator
* Fix failure to update branch color due to deprecated setting variables
* Remove dead code