Updated to latest o-colors

Yeah, @triblondon wants us to use that branch for when we update to node 0.12 I think