Change default theming to Unity + Xcode
Set Git path to /usr/bin/git
Merge branch 'master' into laptop