Pulled in fennel and wing branch changes
gauntlet only mode with g_instantgib=3; some code reformatting
Merge branch 'fennel' into katina-dev