Better Rails 4.0 support and html2haml fix