Feat/combat new

[ponderingdemocritus]

• Updates to combat
• Fixes broken tests
• Updates module controller to be a proxy
• Update Arbiter to be a proxy
• Updates OZ
• Updates protostar version
• Updates nile to 0.9.1

[ponderingdemocritus]

Fixed issues and have deleted dead code from module controller and arbiter