cleenups and make zsh upgrade work
fix python paths and virtualenvwrapper init