node / python
Merge branch 'master' of github.com:etiennelb/prezto