Misc cleanup - newline at eof, no manual id load

It's incorrect to manually load the "id" member - generic factory will
handle that for us.

At a newline at the end of a file, because it makes git happy.

src/butchery_requirements.cpp

@@ -54,8 +54,6 @@ bool butchery_requirements::is_valid() const
 
 void butchery_requirements::load( const JsonObject &jo, const std::string & )
 {
-    mandatory( jo, was_loaded, "id", id );
-
     for( const JsonMember member : jo.get_object( "requirements" ) ) {
         float modifier = std::stof( member.name() );
         requirements.emplace( modifier, std::map<creature_size, std::map<butcher_type, requirement_id>> {} );

src/character_modifier.h

@@ -77,4 +77,4 @@ struct character_modifier {
         friend class generic_factory<character_modifier>;
 };
 
-#endif // CATA_SRC_CHARACTER_MODIFIER_H
+#endif // CATA_SRC_CHARACTER_MODIFIER_H