Whitespace cleanup.

Every time I tried to use rebase, I ended up duplicating my commits rather than removing them. I finally figured out that I could just do...
```
git reset --hard <old-commit-id>
git push -f
```

That got me where I needed to get.

Then when I rebased with the master, it wouldn't sync automatically because of my changes to builder.js so I removed that branch and created a new one that was up to date, then reapplied the changes (not manually, they were sitting dirty ready to be committed somehow).

I guess I'm slowly getting the hang of this. lol I really appreciate all the help though.