Finished converting to haml
Merge branch 'Views_to_haml'