To yaml or to haml..

That is the question.
Merge pull request #1 from colmarius/master

To yaml or to haml..