Merge pull request #22 from hilburn/1.7-update

fixes Potion Pickup stuff
Merge pull request #23 from hilburn/1.7-update

Potion DV update
Fix code whitespace/formatting
Fix code whitespace/formatting
Merge branch '1.7-update' of github.com:jakimfett/AlchemyPlusPlus into 1.7-update
Add fluid ID todos

Thanks @hilburn, i'll poke that with a stick.
merge stuff