Repair ruby test console color. Add new packages:sass, haml
Merge conflicts