allow searching on folders
Merge branch 'master' of github.com:cj/vimrc

* 'master' of github.com:cj/vimrc:
  added tmux