Clean up.
Highlight the branch keywords in C/C++/Java.
Change key binding for etgas/grep-select.