Updated instances of Golfmix to golfmix
Merge branch 'master' into gh-pages