Merge pull request #3 from cheesie67/master

add h,s, and rho to the setTotalTP function
fixed density
added test for dpi2n_dmuj
tristan jeff attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_CEA.py
got muj working
added epsilon for zero concentrations
sized the outputs for chmatrix and pi derivatives in n2pi
complex now optional, for better performance
renamed n2pi to n2ls for n to linear system
computed an intermediate derivative
did s0 and cp0
Merge remote-tracking branch 'origin/master'

Conflicts:
	CEAFS.py
	test_CEA.py
added T,P tests
boo
Merge branch 'master' of https://github.com/jcchin/thermo
stuff
-1 or muj??? things are crazy
Merge pull request #5 from jcchin/master

-1 or muj??? things are crazy
boo