default to develop for new branches, set upstream branch correctly