Merge pull request #26 from way2muchnoise/1.7-update

cleans up the DiffuserMessage
fixes potionIds

for real this time I dun goofed