Merge pull request #386 from way2muchnoise/1.7-update

improves sorting of decomposer recipes in NEI, #384 and more fluid fixes, #387
removes some unused bucket code