Managed to get a few things done today
Moving the intialization of items and blocks to the init package, and simplifying things and removing the infused blocks (Aludel recipes will take their place)
Merge remote-tracking branch 'upstream/master'

Updating to pahi's latest commit.