sensible default editor for git in command line
Merge branch 'master' of github.com:rocker-org/rocker