Add 'haml-rails' gem
Merge branch 'haml'