git: aliases for incoming/outgoing changes; minor .vimrc fix