Combined Colour and Colour4f classes

Also, moved colour constants into Colour class