rename haml files to erb, no content changes yet
Update CHANGELOG.md
template changes; haml to erb, and associated test fixes
Merge branch 'master' of github.com:flpjck/flapjack into 25_change_haml_to_erb
rename template specs
Merge pull request #252 from ali-graham/25_change_haml_to_erb

Change HAML to eRb
merge haml-ejb changes from master
remove haml files post manual merge