Updating for Canary RC 1 and 2

Also mass formatting, fixing some smaller things.

Fixed MessageSystem

Removed viutils dependency (is resolved by canarymod)