*Updated containers. Should fix the items dropping out of inventory bug.

*Changed ContainerTFC's mergeItemStack to be a bit smarter. Hopefully fixes some shift-click bugs. Only tested with the firepit.