More merges from bleedingedge to experimental...

Adds overloading of weapons, be careful if you enable this feature! this DOES NOT unoverload (but could be improved to do so fairly easily) and WILL burn out your guns