vim
Merge branch 'master' of github.com:arielt/environment