Updated things that I've missed/skipped.
Merge branch 'DF2014' of https://github.com/Putnam3145/SPARKING-Dwarf-Fortress-DBZ-mod into DF2014