Removed Gdk::Pixbuf, fixed Colour and Token models
Merge branch 'master' of https://github.com/tannner/RubyC4