added cocoon and haml