Fluid Rendering Fixes

Liquids merging with liquids vertically: http://imgur.com/a/zP09W
Liquids folowing into other liquids: http://imgur.com/a/WXjuw
(Top is before fix, bottom is after fix)