Refactoring master

More master refactoring.

Let's see what ye ol' Jenkins has to say about this.
Why are these seperate if statements? Couldn't they just be one?

    if not skip_verify and 'id' not in load:

It shouldn't evaluate the 'id' not in load at all if the first part of the if statement is false.