Git: some filter stuff
vim: always on rainbow parens

Also other cleanup.