Removes spring from Gemfile, updates Gemfile organization