Merge long first aid action.

Conflicts:
	src/game.cpp
	src/pldata.h
Merge city size variety and crafting menu optimizations.
Give turrets finite ammo.
Full finite turret ammo functionality. Activation and deactivation.
Web Controllability

Got some other errors; committing to safely swap and see if I hit an
Enter or Delete at the wrong point.
Add 9mm ammo to the bot group list to balance the fact they have finite ammo.
Rebalance the new 9mm addition to the bot spawn list.
Re-rebalance it.
Another tweak.
Web: Syntax & safety check

Codehero came through with some C++ syntax support.  Could probably have
done it without xem...but would've been days at it and frustrated as
hell.  Thanks for the assist.  Much appreciated.  :-)
Change starting ammo to a modest 100.
Add base laser turret.
Move recipes.json so that it loads after skills.
stub in calculate_mapgen_weights
Merge remote-tracking branch 'origin/master' into mapgen_sanity

Conflicts:
	src/crafting.cpp
Belated merge fix.
Merge remote-tracking branch 'origin/master' into mapgen_sanity
Load traps from JSON instead of static initializers.
Merge emergency json ordering fix.
riversmapgen