Junk Loot, the rest of it.

Correct templates for all junk loot. Removed npc_loot folder (not
needed).
Merge pull request #870 from zingzing175/master

Junk Loot, the rest of it.