General virtualenvburrito config
Update .ssh
Merge remote-tracking branch 'github/master'