Added autocomplete for tmuxinator configs in subdirs
Added vi mode support for gnzh theme
Added support for chruby in gnzh theme
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

Conflicts:
	themes/gnzh.zsh-theme