Display branch name on push command
Change check of available shopt options

Applying grep to the output of shopt didn't work great for all cases and
produced pipe errors sometimes.  Now errors on setting shopt options are
silently ignored.