Reverting Gemfile-plugins, Gemfile.lock, and schema.rb to what they are in master - something got screwed up with concerto-hardware and it is causing inappropriate merge conflicts.