Added dropbox and zsh
bootstrapping vim.
Merge branch 'master' of https://github.com/exhuma/dotfiles

Conflicts:
	bootstrap
Bump