Merge pull request #524 from BSzili/master

Minor cleanup in the client, removed some dead code from the renderer.
[JK2SP] Some minor cleanup and fixes with the weapon loading code.