Updated plugins
Updated plugins
add tmux.conf
Merge branch 'master' of git://github.com/amix/vimrc
Merge branch 'master' of https://github.com/lufenghuan/vim_runtime