Various small fixes. Closes #324 Closes #317
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA