Update tags command
Update tmux conf
Update vim plugin
Merge branch 'master' into osx