Update litany against rebase for those of us who worship it

The previous litany warned against rebase in the first part, and praised it in the second - this is more consistent :) I suppose we need a version for those that hate rebase as well, though?
Merge pull request #1 from Aeon/master

Update litany against rebase