Various gem updates, bug fixes, and first pass at boostrap overrides