Cache the git branch because checking it on every statusline update is too heavy (e.g. during sexyscroll)
Merge branch 'master' into mac_compat_DEV