cleaned up spec_helper
switch to haml for templates