update gems
update puffing billy and remove monkey patch
fix merge conflicts