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
First use
git pull https://github.com/username/repository master
and then try
git push -u origin master