Updated Contributing.md and .phit config for new branching