Rebase it all to ensure we are on the same base as the rest of the team
Merge pull request #2 from dotted/JazzRebase

Rebase it all to ensure we are on the same base as the rest of the team