I give up! Whenever I try to push I get a stupid:
! [rejected] master -> master (non-fast forward) error: failed to push some refs to \'git@github
When doing a push, try specifying the refspec for the upstream master:
git push upstream upstreammaster:master