Adding golfchannel syncdown
Adding --no-merge param to git branch status