Restructure this document to line up with workflow.
Merge remote-tracking branch 'upstream/master' into docfix4
Update with line wrapping log reading.
Update push with get branch name.
Note about pull request msg, better pull request
Describe  git push to feature branch after pullreq
Suggested fixes from Thomas, rewrap some paragraph
Merge pull request #220 from mppf/docfix4

Update GitCheatSheet to align with workflow

This commit restructures GitCheatSheet.txt to align with the workflow we're all
supposed to be following.. In particular, the commands you're likely to want to
run are different when working with a feature branch, so this way of organizing
it reflects that.

This is mostly just reordering the instructions in the file to align with the
workflow at the top, but includes some small improvements.

Reviewed by @thomasvandoren