Fixed Gemfile.lock and prepped CHANGELOG with a couple more TODOs