Merge remote-tracking branch 'upstream/master'
Suppress some of the most blatantly pointless warnings
Added a placeable funnel item to collect water when it is raining.
Merge remote-tracking branch 'upstream/master'
Added newline to SIGNOFF
Fix wielding items on pickup.

Temporary patch, what I'd like to do is convert all the invlet-taking player functions in ones that take item references.
Resolves #624
Fix for issue #628 - don't go into scrolling logic if there aren't enough to fill the screen
Added a 5-minute timeout to autosaves.

Fixes issue 568.
remove_stack_by_letter in game::advanced_inv (or the way it's called)
causes crash. To replicate, / and move full stack of ammo to ground
moving partial stack works so I've duct taped it
Bugfix megamerge.
Merge funnels for rain collection.

Conflicts:
	game.cpp
	map.cpp
Fix random crash on creating new character with bionics
Move seasons enum to calendar.
Calculate weather conditions ahead of time.
Add weather radio broadcast type to radio towers.
Const up calendar access as much as possible.
Add city names to names module.
Add city names pulled from http://en.wikipedia.org/wiki/List_of_New_England_towns to names.json.
Attach a random city name to cities as they are constructed.