adding virtualenv config
replacing vimdiff with meld; cherry-pick alias
Merge branch 'master' of github.com:cmeury/Dotfiles