the rest of erb converted to haml
Merge pull request #54 from jeanineann/more-converts

the rest of erb converted to haml