git kill branchname

@charlierudolph Aaaaahhhh, for some reason some commits meant for this PR ended up in an already merged PR. I was messing around with `git extract` while being distracted on the resource planning call, so that's my (super lame) excuse... Anyways, please take a look at https://github.com/Originate/git-town/commit/738e3e76158a4803c5695abf71349b21d02033f5, and comment there. I will implement the corresponding fixes in this pull request, and once this gets merged its all going to be kind of okay again...  :smile: 
When dealing with uncommitted files, I propose the statements always come directly after we say what branch we are on. So here it moves up right under `Then I end up on the "main" branch`. I think thats best because thats what it is most related to. 

Same for below and in all other files.