minor gem fixes after update, also included Gemfile.lock