made keychain optional
made virtualenvwrapper optional
Merge branch 'master' of https://github.com/WoLpH/dotfiles