remove erb files, fix haml breaks, initial updates to make tests run