Update bundle and work around some gem bugs (argh).