update
Merge remote-tracking branch 'origin/master'

* origin/master:
  new theme
  update .zshrc
  update new vimrc
  update oh-my-zsh
  auto load virtuelenvwrapper

Conflicts:
	.vimrc.local
	.zshrc