added note about force pushing a rebased branch and removed some redunda...

...nt stuff