Initial commit
Update tmux and zsh
Merge branch 'master' of github.com:bentrevor/vm

Conflicts:
	cookbooks/default/tmux/files/default/.tmux.conf
	cookbooks/default/vim/recipes/default.rb
	cookbooks/default/zsh/files/default/.zshrc