converted a few files to haml
merged in upstream changes
convered a few files to haml and cleaned some css up
re commented out the new homepage
Merge pull request #3 from kellective/haml-conversion

Haml conversion