going back to erb

haml not working with heroku

Merge branch 'master' into erb
Merge branch 'master' of https://github.com/JEmpirical/FamLibs