erbs to haml and other base work
Gem updates