More realistic vehicle collisions.
Merge remote-tracking branch 'origin/master' into Vehicle_Collision

Conflicts:
	map.cpp
	vehicle.cpp
map.cpp
-damage calculation for vehicle-vehicle collisions
-fixed some bugs in line.cpp and vehicle.cpp
-damage for vehicle-vehicle collisions
-changed the equations for vehicle-vehicle collisions (partially elastic collision)
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into Vehicle_Collision
Fix coughing message
Set minimum smoke duration needed for coughing

Also cleaned up some logic in the cough function.
Lowered the amount wood boosts a fire.
Slow down rate at which wood burns for more controllable fires.
-balancing update for vehicle collisions
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into Vehicle_Collision
game.sav versioning and sanity

* game::save, game::load: moved iostream stuff to gamesave.cpp

* seperated misc / weather / location / killcount / player chunks into
  individual lines, and parse on a line-by-line basis. This makes .sav more
  resistent to complete breakage from adding a monster, or even a player data
  variable ( if those variables are added to the end of the variable hairball ).

* Implement versioning support; if a major change is made to the format, it is
  possible to load previous save versions.

All of these changes will allow easier conversion of individual classes to json
  serialization.
Remove #includes for not included stuff
Monsters now live on your drive platter as json strings.
Actually include a required header
Giving rolling papers to the professions that start with weed.

Cause that's just cruel to give them a bag of grass but no means of
smoking it.
Hockey Mask!
Hockey stick!
Add an option to adjust city size.