Better sourcing of virtualenvwrapper
Merge branch 'master' of https://github.com/psophis/dotfiles

* 'master' of https://github.com/psophis/dotfiles:
  Updated oh-my-zsh
  Alias to delete .DS_store files
  New aliases