Simplified gitconfig
Add virtualenv support to emacs
Merge branch 'master' of https://github.com/gmwils/dotfiles