Added scapegoat to build
Bumped scapegoat version
Added scapegoat to build
Fixed a load of warnings
Switched to public scapegoat version