Fixed weapon prepping, loading, and upgrading.
Merge branch 'master' of http://github.com/Sixstring982/GGJ2014