keep vim folders
Merge branch 'master' of https://github.com/danshearmur/dotfiles

* 'master' of https://github.com/danshearmur/dotfiles:
  Update .tmux.conf
  added copy-paste to tmux
  dan commit