Fix Commit History on WebsiteOne

The current git commit history is cluttered with empty merge commits and commits are not in proper order and tree structure.

Running a rebase against master fixes this.

Original History:

![Original History](https://cloud.githubusercontent.com/assets/1736001/3300191/0c57773a-f61e-11e3-9073-3cf6f2cba278.png)

New History:

![After History](https://cloud.githubusercontent.com/assets/1736001/3300380/5d334fc4-f620-11e3-985f-9dfb4524ef9a.png)