Use environment variables for git author details if available
Merge branch 'master' of github.com:robertofarrell/dotfiles