Changing DESKTOP to SERVER so it makes more sense.
Moving bin before other things so the ~/bin directory exists.
Merge remote-tracking branch 'server/master'