Fixed a few bugs
Merge branch 'master' of https://github.com/MCDelta/TuxWeapons

Conflicts:
	common/mcdelta/tuxweapons/TWContent.java
	common/mcdelta/tuxweapons/TuxWeapons.java