Clarify upstream branch convention
Merge pull request #37 from jayfo/GitHub

Resolves #23.

Decided this is not the time and place for Git workflows.