Created 2 new passives, NRG Regeneration and Might Get Health Upon Picking Up Scrap.  Also did some silly spacing fixed in SpreadshotWeapon.lua and Weapon.lua.
Merge branch 'master' of https://github.com/encephalopathy/wepwep
Making Health Upon Scrap Pick Up passive work with Player.lua and MenuEquip.lua.
Merge branch 'master' of https://github.com/encephalopathy/wepwep