Fix Rails/2/3/4 aliases. Back to Solarized Dark. Show merges in git log