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

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.