rolled back gemfile and added haml
Merge branch 'master' of https://github.com/theoretick/discuss-it
haml file was not included in the last version.  this version has it.