Coughing 1
Fix missing paren
Further lower coughing sleep chance
Lower cough volume
Let traits with mixed effects appear in magenta font.

This adds a new element to the trait data structure: mixed_effect.
If this is true it is used to manually declare that some trait has both
positive and negative effects. This only affects the player UI.
Apply mixed_effect to mutations with mixed effects in mutations.json
Fixed bug in which "mixed_effect" color of traits reset to default color if "TRAITS" was selected in UI.

Also changed the mixed_effect color to pink.
Explain new mixed_effect in doc/JSON_INFO.md
Map-extra global reduction

Hopefully this'll quell the complaints about excessive amounts of
corpses.  Granted, it'll reduce the amount of other Neat Stuff too.
Make threshold mutations appear in white font in player UI.
Merge remote-tracking branch 'upstream/master' into aoe-fix
Added comment/lfs installation instructions for verifier script.
removed duplicate comment
Improved debug output when trying to write an invalid value to an attribute in lua.
Print lua stack trace to debug log on error.
Change the lua/json load order.

main.lua is now loaded after JSON, but a new preload.lua can be loaded before JSON.
Update mods.json
Sword draw speed now depends on volume of sword
Iaijutsu message works a bit better now
Certain swords can't perform iaijutsu
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into scabbard
Now a difference between sheathable knives and swords
Added sheath item for knives
Ankle holster can now store pistols or knives
Fix drawing sword not printing message if iaijustu triggers and no monster
is adjacent
Using boots now only shows sheathable knives instead of just tools