Merge branch 'master' into miscFixes
Merge pull request #188 from TazeTSchnitzel/miscFixes

Pumpkin Gib fix fix
Merge branch 'master' into TeamDeathmatch