Updated the contents and fixed the bug
Merge pull request #7698 from Rivet-the-Zombie/more-fixes

Fixes some tool prices.
Merge branch 'medieval' of https://github.com/John-Candlebury/Cataclysm-DDA into John-Candlebury-medieval
Implements primitive cotton industry.

Adding even more self-sufficiency.

New recipes.
Cotton seeds.
Cotton farming.
Cotton bolls.
Carding paddles.
Cotton cleaning.
Cotton balls.
Distaves and spindles.
Cotton spinning.
Knitting needles.
Knitting.
Fix for misc. repair kits.

They had no check to prevent them from being used on guns. This fixes
it.
Merge pull request #7704 from Rivet-the-Zombie/cotton-farming

Implements primitive cotton industry.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Diazepam improvements.

Now also cures the shakes, new recipe, implementation in another recipe,
some modified numbers in the .json entry.
Merge pull request #7706 from Rivet-the-Zombie/Valium-recipe

Diazepam improvements.
Deletes extra bracket

Should have caught this earlier.  :-/
Merge pull request #7707 from KA101/bracketfix

[buildfix] Deletes extra bracket
Merge remote-tracking branch 'Rivet-the-Zombie/master' into FrankenMod