Merge git setup script from master