Clarified naming scheme for bug/feature branches

Clarifies the naming scheme for feature/bug branches.