515 et al

[ra-tolson]

Fixes #515 and last few items of code review feedback.

TIL to push a branch to a new remote after the branch has already been pushed to a different remote, you have to:

git branch --unset-upstream
git push --set-upstream the-new-remote