Tweak branching instructions
Add simple git troubleshooting notes to README