Updated gemfile and changed to haml