Only do a git pull if no local changes on master

Also if not on master branch, print which branch you are on.

One side effect of this code is the git diff will be printed if there
are local changes.