Improved Experimental and Mathematical Techniques for Measurement of Solvent Gas Diffusivity in Heavy Oils