rolled back gemfile and added haml