further haml changes
Merge pull request #7 from wceichelb/haml-conversion

further haml changes