Merged in XP listners from FactoryMod
Merge pull request #1 from gmlaxfanatic/master

Merged in listeners from FactoryMod
Merge pull request #2 from WildWeazel/master

Merge BottleO