New vim plugins, cleanup and new additions to .tmux.conf