Bump up gem versions in Gemfile.lock.  Minor changes to eliminate deprecation warnings.