Fixed gemfile and gemfile.lock discrepencies