review fixes + added rebind test

-changes based on Sam's review on Gitter.
Hi aled what do you think of this:

public boolean isMaster(){
Optional.fromNullable(entity.getAttribute(SparkNode.IS_MASTER)).or(false);
}