simplify git_branch
emacsclient -n
git alias to fetch + checkout mainline
Merge branch 'master' of github.com:dougm/dotfiles