Update contributing guide based on master