Add CBM Chain Lightning and related ammo effects
Add new ammo effects to item factory
Add check for water tiles in shockwave/knockback
check remaining momentum before calling plswim()
minor fix to scentmap, added more colors to scentmap
Added bionics.json
Made init_bionics() read from bionics.json
Updated code documentation for bionics

Why is the documentation stored both in DEVELOPER_FAQ.txt and in
EDITING? These two files should probably be consolidated.
butcher: preserve mtype on meat. iteminfo: "Smells like <original mobtype>", for
players with carnivore, or scentmap, or cheating bastards
FIX #560

Fixes #560
Drugs remove craving when used
Merge CBM enhancements, butchering enhancements, drug craving abatement and flaming weapons.

Conflicts:
	bionics.cpp