Have colors working properly in vim through tmux now - a couple other minor cleanups