Merge pull request #7 from wceichelb/haml-conversion

further haml changes
application.html.(erb -> haml)
application.html haml conversion