Prettification.

I fixed the damage Gap's last commit did to Weapon.java, and I made the
MenuState a bit less "Programmer Art"-y.

Also removed a few extraneous variables in GameState.