Third time is a charm. Fixed a bunch of map things and reverted the axe back to it's premerge values. Also added airlocks back to mining.

Signed-off-by: Jamini <mobiousjami@gmail.com>
Merge pull request #2365 from Jamini/master

Bugfixes