Add haml support
merge conflict