Update and separate Rebase build-step diagrams

![rebase](https://cloud.githubusercontent.com/assets/352082/4314931/6be64aa0-3ee9-11e4-8bd0-5bd5af4c0c47.gif)