[RFR] Feature/updates 03 07

[dhilton]

Git rebase is your friend here: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Helps remove those local commits and allows you to restructure the commits to tell a story of how you worked on the feature. Hope that helps - happy to pair at some point on this approach to PR's.

[enginehouse]

@dhilton - yes, I agree there is a lot of irrelevant chunter going on here - I didn't realise that it was fair game to squash my commits here : )