converted files from haml to erb, cleaned up some code
converted from haml
Merge pull request #19 from MarkDucommun/clean_up_views

Clean up views