follow symlinks when checking the git branch of a file
Merge branch 'master' into mac_compat_DEV
A nice font for my work Mac