Fix code whitespace/formatting
Merge branch '1.7-update' of github.com:jakimfett/AlchemyPlusPlus into 1.7-update