vim updates
Merge branch 'osx_cole_inigral'
update ssh agent
update tmux
misc updates