Added more vim settings and commented out a tmux setting (osx kept resizing panes on me with the mouse)