Slurp can_uncanny_dodge() into uncanny_dodge() to streamline calling it.
Further merge conflict resolution
Merge PR #2237 - Gas spread cleanup
Merge PR #2193 - Headlight aiming

Conflicts:
	veh_interact.cpp
Merge PR #2246 - Uncanny dodge cleanup
fixed evaporating items problem
Fix dead player not getting delete bug.
Merge fix to player save non-deletion on death.
Narrow sidebar: fix SAFE, fuel, and look-around.
Fix uncanny dodge conditional
F2 to load input.txt as input string (character naming screen, vehicle renaming, etc).
Factor monster size in bullet "stun" effects
Remove frame skipping for SDL because it skips "wait creating" popup.
Update HARDTOSHOOT effects and disable old dispersion reliant effects
Merge branch 'inputhelper' of github.com:utunnels/Cataclysm-DDA into inputhelper
Use a different thread for SDL_flip. Lower cpu usage using SDL_Delay(2), previous it was 1, doesn't seem to work.
Enable numpad input during player creation
Reduce salt usage

Because it does not make sense to use half a box for single piece of meat
Buff wood output

Brought to you by friendly Wood Value Watch upon noticing that logs once again burn out in moments
Fixed ascending/descending by stairs