Various bundler-related fixes

These fixes are the result of trying to make this project bundler after a fresh clone, without an existing `Gemfile.lock`. The most relevant commit is c5cb69048ef5bc2b23da5bdf401fc37ec430a675. The others are more general cleanup.