Uses direnv, if available
Merge branch 'master' of github.com:bjjb/dotfiles