Fix vim colors, push to current for git, simplify tmux settings