General cleanup

Cleaned up some Rubocop violations, whitespace issues, dealt with Rubocop changing a classname. Put back Gemfile.