Fixed merged conflicts for you

@mastercoms: I've fixed the merge conflicts in your branch for you. It's rebased against master, so you'll want to `git reset --hard` against this branch.

This PR is really cool! I can't want to see it merged.