Moved coffee back and moved haml gem out of group