allow the super admin role to be taken from the rdr_user_mapping rather than just be hard coded
Merge remote-tracking branch 'robworth/master'