Merge branch 'develop' of github.com:DFHack/dfhack into develop
Comment out more of military-training tweak, which no longer compiles
Update strangemood to check stress level for fell/macabre moods
Update Manipulator to display stress level instead of happiness