So after replacing the master cylinder I can still feel the caliper putting pressure on the disc, Hoping to get some new calipers to fix the problem this week.
Took it for a few photo's at Petrie dam today :).
Only other thing I need to do now is get the rear guards rolled, but that can wait until after I fix the brakes...