updte
Merge branch 'master' of https://github.com/onemanstartup/dotfiles

* 'master' of https://github.com/onemanstartup/dotfiles:
  s
  s
  r
  fff
  a

Conflicts:
	vim/bundles.vim